Changeset e46aa0 for src


Ignore:
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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • src/Helpers/Makefile.am

    r6d8dde re46aa0  
    44INCLUDES = -I$(top_srcdir)/src/
    55
    6 AM_LDFLAGS = -ldl $(BOOST_THREAD_LDFLAGS)
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
     6AM_LDFLAGS = -ldl
     7AM_CPPFLAGS = $(BOOST_CPPFLAGS)
    88
    99HELPERSOURCE = \
    … …  
    3939libCodePatterns_Helpers_la_includedir = $(includedir)/CodePatterns/
    4040libCodePatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/
     41libCodePatterns_Helpers_la_LDFLAGS = \
     42        $(BOOST_THREAD_LDFLAGS)
     43libCodePatterns_Helpers_debug_la_LDFLAGS = \
     44        $(BOOST_THREAD_LDFLAGS)
    4145libCodePatterns_Helpers_la_LIBADD = \
    4246        $(BOOST_THREAD_LIBS)

  • src/Helpers/unittests/Makefile.am

    r6d8dde re46aa0  
    4646        $(top_srcdir)/src/CodePatterns/Info.hpp
    4747ChronosUnitTest_LDADD = \
    48         ../Helpers/libCodePatterns-Helpers-debug.la \
    49         $(BOOST_THREAD_LIBS)
     48        ../Helpers/libCodePatterns-Helpers-debug.la
    5049
    5150InfoUnitTest_SOURCES = UnitTestMain.cpp \
    … …  
    6564        $(top_srcdir)/src/CodePatterns/MemDebug.hpp
    6665InfoUnitTest_LDADD = \
    67         ../Helpers/libCodePatterns-Helpers-debug.la \
    68         $(BOOST_THREAD_LIBS)
     66        ../Helpers/libCodePatterns-Helpers-debug.la
    6967
    7068IteratorAdaptorsUnitTest_SOURCES = UnitTestMain.cpp \
    … …  
    8886        $(top_srcdir)/src/CodePatterns/MemDebug.hpp
    8987LogUnitTest_LDADD = \
    90         ../Helpers/libCodePatterns-Helpers-debug.la \
    91         $(BOOST_THREAD_LIBS)
     88        ../Helpers/libCodePatterns-Helpers-debug.la
    9289
    9390RangeUnitTest_SOURCES = UnitTestMain.cpp \

  • src/Makefile.am

    r6d8dde re46aa0  
    44INCLUDES = -I$(top_srcdir)/src/
    55
    6 AM_LDFLAGS = -ldl $(BOOST_THREAD_LDFLAGS)
     6AM_LDFLAGS = $(BOOST_THREAD_LDFLAGS) -ldl
    77AM_CPPFLAGS = $(BOOST_CPPFLAGS)
    88

  • src/Observer/Makefile.am

    r6d8dde re46aa0  
    55INCLUDES = -I$(top_srcdir)/src/
    66
    7 AM_LDFLAGS = -ldl $(BOOST_THREAD_LDFLAGS)
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
     7AM_LDFLAGS = -ldl
     8AM_CPPFLAGS = $(BOOST_CPPFLAGS)
    99
    1010OBSERVERSOURCE = \

  • src/Observer/unittests/Makefile.am

    r6d8dde re46aa0  
    3636ObserverUnitTest_LDADD = \
    3737        ../Observer/libCodePatterns-Observer-debug.la \
    38         ../Helpers/libCodePatterns-Helpers-debug.la \
    39         $(BOOST_THREAD_LIBS)
     38        ../Helpers/libCodePatterns-Helpers-debug.la
    4039
    4140ObservedContainerUnitTest_SOURCES = UnitTestMain.cpp \
    … …  
    4948ObservedContainerUnitTest_LDADD = \
    5049        ../Observer/libCodePatterns-Observer-debug.la \
    51         ../Helpers/libCodePatterns-Helpers-debug.la \
    52         $(BOOST_THREAD_LIBS)
    53 
     50        ../Helpers/libCodePatterns-Helpers-debug.la
    5451
    5552#AUTOMAKE_OPTIONS = parallel-tests

  • src/Patterns/Makefile.am

    r6d8dde re46aa0  
    55INCLUDES = -I$(top_srcdir)/src/
    66
    7 AM_LDFLAGS = -ldl $(BOOST_THREAD_LDFLAGS)
     7AM_LDFLAGS = -ldl
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    99
    … …  
    3434libCodePatterns_Patterns_la_includedir = $(includedir)/CodePatterns/
    3535libCodePatterns_Patterns_debug_la_includedir = $(includedir)/CodePatterns/
     36libCodePatterns_Patterns_la_LDFLAGS = \
     37        $(BOOST_THREAD_LDFLAGS)
     38libCodePatterns_Patterns_debug_la_LDFLAGS = \
     39        $(BOOST_THREAD_LDFLAGS)
    3640libCodePatterns_Patterns_la_LIBADD = \
    3741        $(BOOST_THREAD_LIBS)

  • src/Patterns/unittests/Makefile.am

    r6d8dde re46aa0  
    7474        ../Observer/libCodePatterns-Observer-debug.la \
    7575        ../Patterns/libCodePatterns-Patterns-debug.la \
    76         ../Helpers/libCodePatterns-Helpers-debug.la \
    77         $(BOOST_THREAD_LIBS)
     76        ../Helpers/libCodePatterns-Helpers-debug.la
    7877
    7978CloneUnitTest_SOURCES = UnitTestMain.cpp \

  • src/unittests/Makefile.am

    r6d8dde re46aa0  
    1212INCLUDES = -I$(top_srcdir)/src/
    1313
    14 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
     14AM_LDFLAGS = ${BOOST_THREAD_LDFLAGS} $(CPPUNIT_LIBS) -ldl
    1515AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    1616
    … …  
    2929        ../Patterns/libCodePatterns-Patterns-debug.la \
    3030        ../Observer/libCodePatterns-Observer-debug.la \
    31         ../Helpers/libCodePatterns-Helpers-debug.la \
    32         $(BOOST_THREAD_LIBS)
     31        ../Helpers/libCodePatterns-Helpers-debug.la
    3332
    3433#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.