summaryrefslogtreecommitdiff
path: root/dix/Makefile.am
diff options
context:
space:
mode:
authorBen Byer <bbyer@freedesktop.org>2009-09-27 10:35:53 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 23:32:19 -0700
commitefacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe (patch)
tree9a8fa5483566a049932046decb2778386a445781 /dix/Makefile.am
parentb3415187e92960cbff784108b5a3a8d130dc34c5 (diff)
Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
Diffstat (limited to 'dix/Makefile.am')
-rw-r--r--dix/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 764860ce3..85a8767d2 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -54,6 +54,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
|| cp Xserver-dtrace.h.in $@
+if !XQUARTZ
# 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 $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
@@ -63,6 +64,7 @@ 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 $@