Changeset 681d36


Ignore:
Timestamp:
Apr 6, 2011, 4:05:13 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
db33b0
Parents:
6aa233
git-author:
Frederik Heber <heber@…> (04/06/11 09:20:34)
git-committer:
Frederik Heber <heber@…> (04/06/11 16:05:13)
Message:

BUGFIX: CPPFLAGS of libCodePatterns ... overrode AM_CPPFLAGS.

  • this made it impossible to link against a boost library from a non-standard directory.
  • Now, we comply with standard procedure from automake manual, by adding AM_CPPFLAGS as last variable to all per-target _CPPFLAGS.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r6aa233 r681d36  
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    77# Position-Independent Code necessary for shared library
    8 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    9 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
     8AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    109
    1110BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB)
    … …  
    9089libCodePatterns_debug_LIBS = $(BOOST_THREAD_LIB)
    9190
    92 libCodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG
    93 libCodePatterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER
     91libCodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
     92libCodePatterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)
    9493
    9594## Define the source file list for the "libexample-@CODEPATTERNS_API_VERSION@.la"
Note: See TracChangeset for help on using the changeset viewer.