diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-15 19:17:48 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-24 16:36:25 -0700 |
| commit | e23bffc41b007f1bc2b8f5cd4ac54213062c95cc (patch) | |
| tree | 0052b22d4dc9701e5550f87b7f75861e156ae29b | |
| parent | 9fa73be9fa543a686ea35c861084f5af37d44caa (diff) | |
Fix build of unit tests when dtrace probes are enabled
ar loses the dtrace probe magic when building static libraries, so we
have to link with the .O files in order to resolve the dtrace probe symbols.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dix/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/xi2/Makefile.am | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 476173e5d..7acdbee18 100644 --- a/configure.ac +++ b/configure.ac @@ -1249,6 +1249,8 @@ else DIX_LIB='$(top_builddir)/dix/libdix.la' OS_LIB='$(top_builddir)/os/libos.la' fi +AC_SUBST([DIX_LIB]) +AC_SUBST([OS_LIB]) MAIN_LIB='$(top_builddir)/dix/libmain.la' AC_SUBST([MAIN_LIB]) diff --git a/dix/Makefile.am b/dix/Makefile.am index 13e5dedd7..764860ce3 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -56,12 +56,12 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d # 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 + ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif dix.c: diff --git a/test/Makefile.am b/test/Makefile.am index d8d89852b..1bd76f587 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -9,6 +9,10 @@ AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS) +if XSERVER_DTRACE +TEST_LDADD += $(OS_LIB) $(DIX_LIB) +endif + xkb_LDADD=$(TEST_LDADD) input_LDADD=$(TEST_LDADD) xtest_LDADD=$(TEST_LDADD) diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am index b8362ca8b..ef6d0f0ab 100644 --- a/test/xi2/Makefile.am +++ b/test/xi2/Makefile.am @@ -17,6 +17,10 @@ INCLUDES = @XORG_INCS@ TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS) COMMON_SOURCES=protocol-common.h protocol-common.c +if XSERVER_DTRACE +TEST_LDADD += $(OS_LIB) $(DIX_LIB) +endif + protocol_xiqueryversion_LDADD=$(TEST_LDADD) protocol_xiquerydevice_LDADD=$(TEST_LDADD) protocol_xiselectevents_LDADD=$(TEST_LDADD) |