diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-12 19:11:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-12 19:11:20 +0000 |
| commit | 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (patch) | |
| tree | db87caaf48c192096c00798d3f18cf458605f4a0 /xorg-server/dix/Makefile.am | |
| parent | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff) | |
| download | vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.tar.gz vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.tar.bz2 vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.zip | |
Updated to:
font-util-1.1.1
xorg-server-1.7.0.901
Diffstat (limited to 'xorg-server/dix/Makefile.am')
| -rw-r--r-- | xorg-server/dix/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/dix/Makefile.am b/xorg-server/dix/Makefile.am index 23fe46007..1caa5d024 100644 --- a/xorg-server/dix/Makefile.am +++ b/xorg-server/dix/Makefile.am @@ -54,16 +54,17 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ || cp Xserver-dtrace.h.in $@ -if !XQUARTZ +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) - $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o + $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) - ld -r -o $@ .libs/*.o -endif + ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif dix.c: |