Before 704a867f8fb7652a8b7d5569bbe44e188457db4e, when XORG is false, libxservertest.la was not ever linked and only built by 'make check'.
Remove it (and its XSERVER_LIBS dependency) to fix the build errors likely caused by ordering of its libraries. Signed-off-by: Mihail Konev <k....@ya.ru> --- test/Makefile.am | 66 +++----------------------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index d56c8fe50515..06e7a382a614 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -126,8 +126,6 @@ xi2-tests: endif !HAVE_LD_WRAP -tests_LDADD += $(XSERVER_LIBS) - if XORG nodist_tests_SOURCES = sdksyms.c @@ -144,7 +142,8 @@ tests_LDADD += \ $(top_builddir)/hw/xfree86/i2c/libi2c.la \ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ $(top_builddir)/Xext/libXvidmode.la \ - @XORG_LIBS@ + $(XSERVER_LIBS) \ + $(XORG_LIBS) BUILT_SOURCES = sdksyms.c CLEANFILES += sdksyms.c @@ -164,66 +163,7 @@ if DRI3 tests_LDADD += $(top_builddir)/dri3/libdri3.la endif -else !XORG - -nodist_tests_SOURCES = \ - ddxstubs.c \ - $(top_srcdir)/mi/miinitext.c - -tests_LDADD += \ - $(top_builddir)/damageext/libdamageext.la \ - $(top_builddir)/fb/libfb.la \ - $(top_builddir)/fb/libwfb.la \ - $(top_builddir)/miext/damage/libdamage.la \ - $(top_builddir)/miext/sync/libsync.la \ - $(top_builddir)/randr/librandr.la \ - $(top_builddir)/render/librender.la \ - $(top_builddir)/Xext/libXext.la \ - $(top_builddir)/Xext/libXextdpmsstubs.la \ - $(top_builddir)/Xext/libXvidmode.la \ - $(top_builddir)/Xi/libXi.la \ - $(top_builddir)/Xi/libXistubs.la \ - $(top_builddir)/xfixes/libxfixes.la \ - $(top_builddir)/xkb/libxkb.la \ - $(top_builddir)/xkb/libxkbstubs.la - -if COMPOSITE -tests_LDADD += \ - $(top_builddir)/composite/libcomposite.la -endif - -if DBE -tests_LDADD += \ - $(top_builddir)/dbe/libdbe.la -endif - -if GLX -tests_LDADD += \ - $(top_builddir)/glx/libglx.la -endif - -if RECORD -tests_LDADD += \ - $(top_builddir)/record/librecord.la -endif - -if DRI3 -tests_LDADD += \ - $(top_builddir)/dri3/libdri3.la -endif - -if XQUARTZ -tests_LDADD += \ - $(top_builddir)/miext/rootless/librootless.la -tests_LDADD += -lXplugin -endif - -if XWIN_MULTIWINDOWEXTWM -tests_LDADD += \ - $(top_builddir)/miext/rootless/librootless.la -endif - -endif !XORG +endif XORG tests_DEPENDENCIES = $(tests_LDADD) endif ENABLE_UNIT_TESTS -- 2.9.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel