Changeset e46aa0 for src/Helpers

Timestamp:

Feb 13, 2013, 4:44:13 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

8f60da

Parents:

6d8dde

git-author:

Frederik Heber <heber@…> (02/13/13 16:24:45)

git-committer:

Frederik Heber <heber@…> (02/13/13 16:44:13)

Message:

FIX: Usage of boost's cppflags, ldflags and libs was a bit inconsistent.

• only Helpers and Patterns require boost thread.

Location:

src/Helpers

Files:

• Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (3 diffs)

src/Helpers/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src/
 
-AM_LDFLAGS = -ldl $(BOOST_THREAD_LDFLAGS)
-AM_CPPFLAGS = ${BOOST_CPPFLAGS}
+AM_LDFLAGS = -ldl
+AM_CPPFLAGS = $(BOOST_CPPFLAGS)
 
 HELPERSOURCE = \
@@ -39 +39 @@
 libCodePatterns_Helpers_la_includedir = $(includedir)/CodePatterns/
 libCodePatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/
+libCodePatterns_Helpers_la_LDFLAGS = \
+        $(BOOST_THREAD_LDFLAGS)
+libCodePatterns_Helpers_debug_la_LDFLAGS = \
+        $(BOOST_THREAD_LDFLAGS)
 libCodePatterns_Helpers_la_LIBADD = \
         $(BOOST_THREAD_LIBS)

src/Helpers/unittests/Makefile.am

@@ -46 +46 @@
         $(top_srcdir)/src/CodePatterns/Info.hpp
 ChronosUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la \
-        $(BOOST_THREAD_LIBS)
+        ../Helpers/libCodePatterns-Helpers-debug.la
 
 InfoUnitTest_SOURCES = UnitTestMain.cpp \
@@ -65 +64 @@
         $(top_srcdir)/src/CodePatterns/MemDebug.hpp
 InfoUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la \
-        $(BOOST_THREAD_LIBS)
+        ../Helpers/libCodePatterns-Helpers-debug.la
 
 IteratorAdaptorsUnitTest_SOURCES = UnitTestMain.cpp \
@@ -88 +86 @@
         $(top_srcdir)/src/CodePatterns/MemDebug.hpp
 LogUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la \
-        $(BOOST_THREAD_LIBS)
+        ../Helpers/libCodePatterns-Helpers-debug.la
 
 RangeUnitTest_SOURCES = UnitTestMain.cpp \