diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 22:10:55 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-09 09:16:44 +1000 |
| commit | 398b5e01a7976ee8940105cf2be7c28ce57c3858 (patch) | |
| tree | 19b0abd3a3d3649cc99e5318bc866c37041f7096 | |
| parent | b916ac74e27ce8998ac0866bb2b39dcd378e0182 (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>
(cherry picked from commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44)
| -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 0996cffea..1caa5d024 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -54,6 +54,8 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d $(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) ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif -endif dix.c: touch $@ |