xserver: Branch 'master'

[Keith Packard]

 dix/Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Oct 7 22:10:55 2009 -0700

    Fix make warning: overriding commands for target `dix.O'
    
    Not only does automake generate unnecessary rules for dix.O on platforms
    for which SPECIAL_DTRACE_OBJECTS is false, it generates duplicate sets
    when "if SPECIAL_DTRACE_OBJECTS" is nested inside "if XSERVER_DTRACE"
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/Makefile.am b/dix/Makefile.am
index ae47dc4..b29f2e1 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -54,6 +54,8 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
 	$(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
 		|| cp Xserver-dtrace.h.in $@
 
+endif
+
 if SPECIAL_DTRACE_OBJECTS
 # Generate dtrace object code for probes in libdix
 dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
@@ -64,7 +66,6 @@ noinst_PROGRAMS = dix.O
 dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
 	$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
 endif
-endif
 
 dix.c:
 	touch $@