diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 22:10:55 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-08 08:56:52 -0700 |
| commit | c0a1bb511a4629bf5683d8a710dc4a1c577a5d44 (patch) | |
| tree | f665cdb665f824616ad652f95614188be21390b4 | |
| parent | b0dd6be2c8703f7062d45ac9fd646550c7d54e3b (diff) | |
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@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | dix/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am index ae47dc472..b29f2e189 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 $@ |