Changeset cdf2e4 for src

Timestamp:

Dec 22, 2010, 5:39:32 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

392a79

Parents:

70672e3

git-author:

Frederik Heber <heber@…> (12/22/10 17:20:51)

git-committer:

Frederik Heber <heber@…> (12/22/10 17:39:32)

Message:

From now on we create two libs, one with and one without debug.

• We specifically create two libs, as the debug one is not just the old lib but with some debug symbols. MemDebug, Asserts and ObserverLog implementations are clearly missing in these. This justifies to have two distinct (in an odd way) libraries.
• additional CodePattern-debug.pc file
• extended ax_codepatterns.m4 macro to have debug as an extra argument

Location:

src

Files:

• Makefile.am (modified) (4 diffs)
• Patterns/unittests/Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (1 diff)

src/Makefile.am

@@ -73 +73 @@
 
 ##-@CODEPATTERNS_API_VERSION@
-lib_LTLIBRARIES = libCodePatterns.la
+lib_LTLIBRARIES = libCodePatterns.la libCodePatterns-debug.la
 libCodePatterns_LIBS = $(BOOST_THREAD_LIB)
+libCodePatterns_debug_LIBS = $(BOOST_THREAD_LIB)
+
+libCodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG
+libCodePatterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER
 
 ## Define the source file list for the "libexample-@CODEPATTERNS_API_VERSION@.la"
@@ -86 +90 @@
 #-$(CODEPATTERNS_API_VERSION)
 libCodePatterns_la_SOURCES = ${HELPERSSOURCE}
+libCodePatterns_debug_la_SOURCES = ${HELPERSSOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -92 +97 @@
 #-$(CODEPATTERNS_API_VERSION)
 libCodePatterns_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
+libCodePatterns_debug_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -113 +119 @@
 ## in which case the correct install location would be $(datadir)/pkgconfig.
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/CodePatterns.pc
+pkgconfig_DATA = $(top_builddir)/CodePatterns.pc $(top_builddir)/CodePatterns-debug.pc
 
 FORCE:

src/Patterns/unittests/Makefile.am

@@ -20 +20 @@
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 TESTLIBS = \
-        ../../libCodePatterns.la \
+        ../../libCodePatterns-debug.la \
         $(BOOST_LIB)
 

src/unittests/Makefile.am

@@ -20 +20 @@
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 TESTLIBS = \
-        ../libCodePatterns.la \
+        ../libCodePatterns-debug.la \
         $(BOOST_LIB)