Fix linking of libdbus-testutils.la with Automake targeting Windows
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 12:14:54 +0000 (13:14 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Aug 2011 09:26:26 +0000 (10:26 +0100)
This regressed in commit 9875480ed - libdbus-testutils.la needs static
linking too.

test/Makefile.am

index 971299a909b6c76c28bf480eb6767df1c2f1a894..d26b21f885f8f14151a8a43f6bbbd996a6241eff 100644 (file)
@@ -13,6 +13,13 @@ AM_CPPFLAGS = \
 # improve backtraces from test stuff
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
+static_cppflags = \
+       $(AM_CPPFLAGS) \
+       -DDBUS_STATIC_BUILD \
+       $(NULL)
+
+libdbus_testutils_la_CPPFLAGS = \
+       $(static_cppflags)
 libdbus_testutils_la_SOURCES = \
        test-utils.c \
        test-utils.h \
@@ -65,11 +72,6 @@ endif !DBUS_BUILD_TESTS
 
 noinst_PROGRAMS= $(TEST_BINARIES)
 
-static_cppflags = \
-       $(AM_CPPFLAGS) \
-       -DDBUS_STATIC_BUILD \
-       $(NULL)
-
 test_service_CPPFLAGS = $(static_cppflags)
 test_service_LDADD = libdbus-testutils.la
 test_names_CPPFLAGS = $(static_cppflags)