[PATCH xserver] tests: Fix LDADD

Mihail Konev k.mvc at ya.ru
Sat Jan 14 01:25:01 UTC 2017


704a867 tries to preserve libxservertest_la_LIBADD violations,
but it breaks some use cases.

Follow the automake manual.

Buglink: https://lists.x.org/archives/xorg-devel/2017-January/052320.html
Reported-by: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
 test/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 729402f104ce..409e010b55f9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -55,6 +55,9 @@ tests_CPPFLAGS += $(AM_CPPFLAGS)
 endif
 
 tests_LDFLAGS = \
+	$(XORG_SYS_LIBS) \
+	$(XSERVER_SYS_LIBS) \
+	$(GLX_SYS_LIBS) \
 	-Wl,-wrap,dixLookupWindow \
 	-Wl,-wrap,dixLookupClient \
 	-Wl,-wrap,WriteToClient \
@@ -64,8 +67,6 @@ tests_LDFLAGS = \
 	-Wl,-wrap,GrabButton \
 	$()
 
-tests_LDADD = $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
-
 tests_SOURCES = \
         tests-common.c \
         fixes.c \
@@ -221,7 +222,6 @@ endif
 
 endif !XORG
 
-tests_DEPENDENCIES = $(tests_LDADD)
 endif ENABLE_UNIT_TESTS
 
 EXTRA_DIST = \
-- 
2.9.2



More information about the xorg-devel mailing list