From e2adbfa5855047b70eb03a85b9dc575386f784a7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 5 Aug 2011 13:14:54 +0100 Subject: [PATCH 1/3] Fix linking of libdbus-testutils.la with Automake targeting Windows This regressed in commit 9875480ed - libdbus-testutils.la needs static linking too. --- test/Makefile.am | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 7adb823..a870d3d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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) -- 1.7.5.4