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 /test | |
| 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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/xi2/Makefile.am | 4 |
2 files changed, 8 insertions, 0 deletions
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) |