Avoids one more linking. In makefile, remove OS_LIB and DIX_LIB to avoid double-inclusion. Also move the libxorgos.la to satisfy libcommon.la.
Signed-off-by: Mihail Konev <[email protected]> --- test/Makefile.am | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index bbb233f19842..bd19dac13d58 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,6 @@ CLEANFILES = if ENABLE_UNIT_TESTS -check_LTLIBRARIES = libxservertest.la noinst_PROGRAMS = simple-xinit tests tests_SOURCES = list.c string.c tests.c @@ -68,22 +67,19 @@ AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \ -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \ -I$(top_srcdir)/hw/xfree86/dri2 -I$(top_srcdir)/dri3 endif -tests_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) +tests_LDADD = $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) tests_CPPFLAGS = $(AM_CPPFLAGS) -if SPECIAL_DTRACE_OBJECTS -tests_LDADD += $(OS_LIB) $(DIX_LIB) -endif - -libxservertest_la_LIBADD = $(XSERVER_LIBS) +tests_LDADD += $(XSERVER_LIBS) if XORG -nodist_libxservertest_la_SOURCES = sdksyms.c -libxservertest_la_LIBADD += \ +nodist_tests_SOURCES = sdksyms.c + +tests_LDFLAGS += \ $(top_builddir)/hw/xfree86/loader/libloader.la \ - $(top_builddir)/hw/xfree86/os-support/libxorgos.la \ $(top_builddir)/hw/xfree86/common/libcommon.la \ + $(top_builddir)/hw/xfree86/os-support/libxorgos.la \ $(top_builddir)/hw/xfree86/parser/libxf86config.la \ $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \ $(top_builddir)/hw/xfree86/modes/libxf86modes.la \ @@ -101,19 +97,19 @@ sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c $(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c if DRI -libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la +tests_LDADD += $(top_builddir)/hw/xfree86/dri/libdri.la endif if DRI2 -libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la +tests_LDADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la endif else -nodist_libxservertest_la_SOURCES = \ +nodist_tests_SOURCES = \ ddxstubs.c \ $(top_srcdir)/mi/miinitext.c -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/damageext/libdamageext.la \ $(top_builddir)/fb/libfb.la \ $(top_builddir)/fb/libwfb.la \ @@ -131,38 +127,38 @@ libxservertest_la_LIBADD += \ $(top_builddir)/xkb/libxkbstubs.la if COMPOSITE -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/composite/libcomposite.la endif if DBE -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/dbe/libdbe.la endif if GLX -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/glx/libglx.la endif if RECORD -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/record/librecord.la endif if XQUARTZ -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/miext/rootless/librootless.la tests_LDADD += -lXplugin endif if XWIN_MULTIWINDOWEXTWM -libxservertest_la_LIBADD += \ +tests_LDADD += \ $(top_builddir)/miext/rootless/librootless.la endif endif -libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) +tests_DEPENDENCIES = $(tests_LDADD) endif ENABLE_UNIT_TESTS EXTRA_DIST = \ -- 2.9.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
