summaryrefslogtreecommitdiff
path: root/os
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:34:28 -0700
commitb49dba33f94b51ba9a14803f0d81ccde2cb778f8 (patch)
tree7699fc023708c3b763518fe25083a6f3aa3b6e90 /os
parentcf2e3312cff3f341e9edba8c321a4ca7ffd8748e (diff)
Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
Diffstat (limited to 'os')
-rw-r--r--os/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/os/Makefile.am b/os/Makefile.am
index f89da6ba2..9ce8ff274 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -41,6 +41,7 @@ endif
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
$(XDMCP_SRCS) $(STRLCAT_SRCS)
+if !XQUARTZ
if XSERVER_DTRACE
# Generate dtrace object code for probes in libos & libdix
dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
@@ -51,6 +52,7 @@ noinst_PROGRAMS = os.O
os.O: dtrace.o $(am_libos_la_OBJECTS)
ld -r -o $@ dtrace.o .libs/*.o
endif
+endif
os.c:
touch $@