[PATCH 1/4] Remove AM_LDFLAGS usage
Sam Spilsbury
smspillaz at gmail.com
Thu Sep 12 05:31:25 PDT 2013
We are not building everything here as a module, only the test modules.
---
tests/Makefile.am | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 398a275..3a36619 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,8 @@ module_tests = \
surface-test.la \
surface-global-test.la
+weston_test = weston-test.la
+
weston_tests = \
keyboard.weston \
event.weston \
@@ -45,7 +47,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src \
-DUNIT_TEST \
$(COMPOSITOR_CFLAGS)
-AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
+
config_parser_test_LDADD = \
../shared/libshared.la \
@@ -54,11 +56,13 @@ config_parser_test_SOURCES = \
config-parser-test.c
surface_global_test_la_SOURCES = surface-global-test.c
+surface_global_test_la_LDFLAGS = -module -avoid-version -rpath $(libdir)
surface_test_la_SOURCES = surface-test.c
+surface_test_la_LDFLAGS = -module -avoid-version -rpath $(libdir)
-weston_test = weston-test.la
weston_test_la_LIBADD = $(COMPOSITOR_LIBS) \
../shared/libshared.la
+weston_test_la_LDFLAGS = -module -avoid-version -rpath $(libdir)
weston_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
weston_test_la_SOURCES = \
weston-test.c \
--
1.8.3.2
More information about the wayland-devel
mailing list