Changeset 6309fd for src

Timestamp:

Aug 17, 2014, 4:07:55 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

ec61ec

Parents:

0ab195

Message:

Fixes for Ubuntu 14.04.

• subdir-objects required for automake.
• in Makefile.am's INCLUDES is deprecated (for AM_CPPFLAGS).
• updated boost.m4 (serial 22) required due to boost thread depending on boost system library. (Re-)Added checks for EXCEPTION and ITERATOR.

Location:

src

Files:

• Helpers/Makefile.am (modified) (1 diff)
• Makefile.am (modified) (5 diffs)
• Observer/Makefile.am (modified) (1 diff)
• Patterns/Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (1 diff)

src/Helpers/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src/
-
 AM_LDFLAGS = -ldl
-AM_CPPFLAGS = $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/ $(BOOST_CPPFLAGS)
 
 HELPERSOURCE = \

src/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src/
-
 AM_LDFLAGS = $(BOOST_THREAD_LDFLAGS) -ldl
-AM_CPPFLAGS = $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/ $(BOOST_CPPFLAGS)
 
 SUBDIRS = Helpers Patterns Observer unittests
@@ -20 +18 @@
 codepatterns_config_SOURCES = \
         $(CONFIGSOURCES) \
-        $(top_builddir)/src/codepatterns-config.cpp
+        codepatterns-config.cpp
 codepatterns_config_CPPFLAGS = $(BOOST_CPPFLAGS)
 codepatterns_config_LDFLAGS = $(AM_LDFLAGS) \
@@ -30 +28 @@
 codepatterns_debug_config_SOURCES = \
         $(CONFIGSOURCES) \
-        $(top_builddir)/src/codepatterns-debug-config.cpp
+        codepatterns-debug-config.cpp
 codepatterns_debug_config_CPPFLAGS = $(BOOST_CPPFLAGS)
 codepatterns_debug_config_LDFLAGS = $(AM_LDFLAGS) \
@@ -46 +44 @@
 # this includes source files that need to be present at multiple points
 SOURCE =  \
-        $(top_builddir)/src/version.cpp
+        version.cpp
 SOURCEDEBUG = \
         $(SOURCE)
@@ -123 +121 @@
 EXTRA_DIST = $(srcdir)/.git-version
 
-$(top_builddir)/src/version.cpp: $(srcdir)/.git-version
+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/codepatterns-config.cpp:
+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:
+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" > $@

src/Observer/Makefile.am

@@ -3 +3 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/
-
 AM_LDFLAGS = -ldl
-AM_CPPFLAGS = $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/ $(BOOST_CPPFLAGS)
 
 OBSERVERSOURCE = \

src/Patterns/Makefile.am

@@ -3 +3 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/
-
 AM_LDFLAGS = -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS}
+AM_CPPFLAGS = -I$(top_srcdir)/src/ ${BOOST_CPPFLAGS}
 
 PATTERNSOURCE =

src/unittests/Makefile.am

@@ -10 +10 @@
 TESTHEADERS =
 
-INCLUDES = -I$(top_srcdir)/src/
-
 AM_LDFLAGS = ${BOOST_THREAD_LDFLAGS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/ ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
 
 include $(top_srcdir)/src/Helpers/unittests/Makefile.am