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 <[email protected]> Acked-by: Peter Hutterer <[email protected]> --- dix/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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 $@ -- 1.5.6.5 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
