Browse Source

[master] Force generation of shared test libraries when static linking.

The new hooks tests require two shared libraries, which were not generated
when static linking was used and caused tests to fail. This patch forces
generation of these shared libraries. Okayed on jabber.
Marcin Siodelski 11 years ago
parent
commit
f17c3559e3
1 changed files with 3 additions and 0 deletions
  1. 3 0
      src/lib/dhcpsrv/tests/Makefile.am

+ 3 - 0
src/lib/dhcpsrv/tests/Makefile.am

@@ -15,6 +15,7 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
 if USE_STATIC_LINK
 AM_LDFLAGS = -static
+TEST_LIBS_LDFLAGS = -Bshareable
 endif
 
 CLEANFILES = *.gcno *.gcda
@@ -30,10 +31,12 @@ lib_LTLIBRARIES = libco1.la libco2.la
 libco1_la_SOURCES  = callout_library.cc
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
 libco1_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libco1_la_LDFLAGS = $(TEST_LIBS_LDFLAGS)
 
 libco2_la_SOURCES  = callout_library.cc
 libco2_la_CXXFLAGS = $(AM_CXXFLAGS)
 libco2_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
+libco2_la_LDFLAGS = $(TEST_LIBS_LDFLAGS)
 
 
 TESTS += libdhcpsrv_unittests