Changeset 6d8dde

Timestamp:

Feb 13, 2013, 3:55:20 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

e46aa0

Parents:

5d1550

git-author:

Frederik Heber <heber@…> (01/26/13 12:50:04)

git-committer:

Frederik Heber <heber@…> (02/13/13 15:55:20)

Message:

FIX: codepatterns-config did not supply correct flags for debug lib.

• we required another executable codepatterns-debug-config for that.
• also version.cpp did not contain correct versioning in a pkg-config sense, i.e. 1.2.3 but with commit suffixed.
• version.cpp and specific codepatterns-config.cpp are not created in build directory, not in src anymore.

Files:

• configure.ac (modified) (1 diff)
• m4/ax_codepatterns.m4 (modified) (1 diff)
• src/Makefile.am (modified) (3 diffs)
• src/codepatterns-config.cpp (deleted)

configure.ac

@@ -5 +5 @@
 AC_INIT([CodePatterns], [1.2.3], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
 AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR([src/codepatterns-config.cpp])
+AC_CONFIG_SRCDIR([src/codepatterns-config-main.cpp])
 AC_CONFIG_HEADERS([config.h libCodePatterns_config.h])
 AC_CONFIG_MACRO_DIR([m4])

m4/ax_codepatterns.m4

@@ -43 +43 @@
       AC_PATH_PROG(CodePatterns_CONFIG, codepatterns-config, no)
       if test "x$CodePatterns_CONFIG" = xno && test x$codepatterns_prefix != x ; then
-        if test -e $codepatterns_prefix/bin/codepatterns-config; then
+        AC_MSG_CHECKING([for alternative codepatterns-debug-config location])
+        if test -e $codepatterns_prefix/bin/codepatterns-debug-config; then
           codepatterns_pkgconfig=no
-          CodePatterns_CONFIG="$codepatterns_prefix/bin/codepatterns-config"
+          CodePatterns_CONFIG="$codepatterns_prefix/bin/codepatterns-debug-config"
+          AC_MSG_RESULT([yes])
+        else
+          AC_MSG_RESULT([no])
         fi
       fi

src/Makefile.am

@@ -11 +11 @@
 ## config utility ###
 
-bin_PROGRAMS = codepatterns-config
+bin_PROGRAMS = codepatterns-config codepatterns-debug-config
+
+CONFIGSOURCES = \
+        codepatterns-config-main.cpp \
+        codepatterns-config.hpp \
+        version.hpp
 
 codepatterns_config_SOURCES = \
-        codepatterns-config-main.cpp \
-        codepatterns-config.cpp \
-        codepatterns-config.hpp \
-        version.hpp
-codepatterns_config_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+        $(CONFIGSOURCES) \
+        $(top_builddir)/src/codepatterns-config.cpp
+codepatterns_config_CPPFLAGS = $(BOOST_CPPFLAGS)
+codepatterns_config_LDFLAGS = $(AM_LDFLAGS) \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 codepatterns_config_LDADD = \
         $(BOOST_PROGRAM_OPTIONS_LIBS) \
         libCodePatterns.la
 
+codepatterns_debug_config_SOURCES = \
+        $(CONFIGSOURCES) \
+        $(top_builddir)/src/codepatterns-debug-config.cpp
+codepatterns_debug_config_CPPFLAGS = $(BOOST_CPPFLAGS)
+codepatterns_debug_config_LDFLAGS = $(AM_LDFLAGS) \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+codepatterns_debug_config_LDADD = \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        libCodePatterns.la
+
+
 
 include_HEADERS = \
-        $(srcdir)/version.hpp
+        version.hpp
+
 
 # this includes source files that need to be present at multiple points
 SOURCE =  \
-        $(srcdir)/version.cpp
+        $(top_builddir)/src/version.cpp
 SOURCEDEBUG = \
         $(SOURCE)
 
 HEADER =  \
-        $(srcdir)/version.hpp
+        version.hpp
 
 ##-@CODEPATTERNS_API_VERSION@
@@ -95 +112 @@
 $(srcdir)/.git-version: FORCE
         @if (test -d $(top_srcdir)/.git && cd $(srcdir) \
-             && { git describe | sed -e "s#^v##" ; } ) > .git-version-t 2>/dev/null \
+             && { git describe --abbrev=0 | sed -e "s#^v##" ; } ) > .git-version-t 2>/dev/null \
           && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
           mv -f .git-version-t $(srcdir)/.git-version; \
@@ -104 +121 @@
 EXTRA_DIST = $(srcdir)/.git-version
 
-$(srcdir)/version.cpp: $(srcdir)/.git-version
-        echo -e "const char *CODEPATTERNSVERSION = \"`cat $(srcdir)/.git-version`\";\nconst char *CODEPATTERNSFULLVERSION = \"$(PACKAGE_NAME) version "`cat $(srcdir)/.git-version`"\";\n" > $@
+$(top_builddir)/src/version.cpp: $(srcdir)/.git-version
+        echo -e "const char *CODEPATTERNSVERSION = \"`cat <$(srcdir)/.git-version`\";\nconst char *CODEPATTERNSFULLVERSION = \"$(PACKAGE_NAME) version "`cat $(srcdir)/.git-version`"\";\n" > $@
 
-$(srcdir)/codepatterns-config.cpp:
+$(top_builddir)/src/codepatterns-config.cpp:
         echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-lCodePatterns $(BOOST_THREAD_LIB)\";\n" > $@
 
+$(top_builddir)/src/codepatterns-debug-config.cpp:
+        echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-lCodePatterns-debug $(BOOST_THREAD_LIB)\";\n" > $@