summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-05 16:52:19 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-06 19:40:19 -0700
commit4b0911565d18b1aefca564315d0f1b9b4a17aa65 (patch)
tree03ee4f2a0de35aa9ecce7d060ed815a856c9f5fb /os
parent8c51b886400c5962b31ff565771be1b01a3ca8fb (diff)
Add platform tests for Dtrace linker magic
Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'os')
-rw-r--r--os/Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/os/Makefile.am b/os/Makefile.am
index 9ce8ff274..22ed1946c 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -41,8 +41,7 @@ endif
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
$(XDMCP_SRCS) $(STRLCAT_SRCS)
-if !XQUARTZ
-if XSERVER_DTRACE
+if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libos & libdix
dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
@@ -52,7 +51,6 @@ noinst_PROGRAMS = os.O
os.O: dtrace.o $(am_libos_la_OBJECTS)
ld -r -o $@ dtrace.o .libs/*.o
endif
-endif
os.c:
touch $@