Changeset 09305f


Ignore:
Timestamp:
Apr 6, 2011, 4:05:13 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
0fce81
Parents:
2c67a4
git-author:
Frederik Heber <heber@…> (04/06/11 09:59:19)
git-committer:
Frederik Heber <heber@…> (04/06/11 16:05:13)
Message:

Moved BOOST_LDFLAGS from BOOST_LIB to AM_LDFLAGS.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r2c67a4 r09305f  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
    77# Position-Independent Code necessary for shared library
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    99
    10 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB)
     10BOOST_LIB = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB)
    1111
    1212

  • src/Patterns/unittests/Makefile.am

    r2c67a4 r09305f  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    … …  
    2525noinst_PROGRAMS = $(TESTS)
    2626
    27 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
     27BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    2828TESTLIBS = \
    2929        ../../libCodePatterns-debug.la \

  • src/unittests/Makefile.am

    r2c67a4 r09305f  
    77INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    88
    9 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
     9AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
    1010AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    1111AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    … …  
    2222noinst_PROGRAMS = $(TESTS) TestRunner
    2323
    24 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
     24BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    2525TESTLIBS = \
    2626        ../libCodePatterns-debug.la \
Note: See TracChangeset for help on using the changeset viewer.