From b536cddde8a421788543a8290b944c6271e63b3f Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 6 Sep 2009 01:43:25 +0000
Subject: Moved configuration of CXXFLAGS compile options to configure.ac
 script to make them consistent across the project. Increased warning level
 and enabled support for debug and profiling.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@811742 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/sca/Makefile.am                                                | 1 +
 cpp/sca/configure.ac                                               | 3 +++
 cpp/sca/runtime/core/src/Makefile.am                               | 2 --
 cpp/sca/runtime/extensions/cpp/src/Makefile.am                     | 2 --
 cpp/sca/runtime/extensions/php/src/Makefile.am                     | 4 +---
 cpp/sca/runtime/extensions/python/src/Makefile.am                  | 5 +----
 cpp/sca/runtime/extensions/rest/interface/src/Makefile.am          | 4 +---
 cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am     | 5 +----
 cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am      | 4 +---
 cpp/sca/runtime/extensions/ruby/src/Makefile.am                    | 4 +---
 cpp/sca/runtime/extensions/sca/reference/src/Makefile.am           | 4 +---
 cpp/sca/runtime/extensions/sca/service/src/Makefile.am             | 4 +---
 cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am     | 4 +---
 cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am       | 4 +---
 cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am              | 1 -
 cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am | 1 -
 cpp/sdo/runtime/core/sdo_axiom/Makefile.am                         | 3 +--
 cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am                    | 3 +--
 cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am                   | 1 -
 cpp/sdo/runtime/core/test/Makefile.am                              | 1 -
 cpp/sdo/samples/misc/Makefile.am                                   | 1 -
 21 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/cpp/sca/Makefile.am b/cpp/sca/Makefile.am
index 9aa3eca40c..c13c3b5428 100644
--- a/cpp/sca/Makefile.am
+++ b/cpp/sca/Makefile.am
@@ -21,6 +21,7 @@ datadir=$(prefix)
 
 data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
 EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh builddist.sh configure.sh makebindist.sh GettingStarted.html
+
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
 	rm -rf `find $(distdir)/ -type d -name .deps`
diff --git a/cpp/sca/configure.ac b/cpp/sca/configure.ac
index 476b531087..4daeef1985 100644
--- a/cpp/sca/configure.ac
+++ b/cpp/sca/configure.ac
@@ -91,6 +91,9 @@ if test "x$LIBXML2_LIB" = "x"; then
   AC_SUBST([LIBXML2_LIB], ["/usr/lib"])
 fi
 
+# Configure GCC C++ compile options
+AC_SUBST([CXXFLAGS], ["$(CXXFLAGS) -D_DEBUG -O0 -g3 -Wall -std=c++0x -fmessage-length=0"])
+
 AC_MSG_CHECKING(whether to build all component type and binding extensions)
 AC_ARG_ENABLE(all-extensions, [AS_HELP_STRING([--enable-all-extensions],[build all runtime extensions [default=no]])],
 [ case "${enableval}" in
diff --git a/cpp/sca/runtime/core/src/Makefile.am b/cpp/sca/runtime/core/src/Makefile.am
index db66c8fe51..ebba243583 100644
--- a/cpp/sca/runtime/core/src/Makefile.am
+++ b/cpp/sca/runtime/core/src/Makefile.am
@@ -76,5 +76,3 @@ libtuscany_sca_la_LIBADD = -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo -lpthread
 INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include
 
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-                   
diff --git a/cpp/sca/runtime/extensions/cpp/src/Makefile.am b/cpp/sca/runtime/extensions/cpp/src/Makefile.am
index bb28aed8b9..f234261f5b 100644
--- a/cpp/sca/runtime/extensions/cpp/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/cpp/src/Makefile.am
@@ -46,8 +46,6 @@ libtuscany_sca_cpp_la_LIBADD = -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo \
 INCLUDES = -Imodel -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
 moduledir=$(prefix)/extensions/cpp/module
 extension = libtuscany_sca_cpp$(libsuffix)
 	                    
diff --git a/cpp/sca/runtime/extensions/php/src/Makefile.am b/cpp/sca/runtime/extensions/php/src/Makefile.am
index b3622779e6..d0b04262f5 100644
--- a/cpp/sca/runtime/extensions/php/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/php/src/Makefile.am
@@ -48,12 +48,10 @@ INCLUDES = -I${TUSCANY_SCACPP}/include \
            -I${PHP_INCLUDE}/sapi/embed \
            -I${PHP_SCA_SDO_INCLUDE}
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG 
-                   
 moduledir=$(prefix)/module
 extension = libtuscany_sca_php$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)
diff --git a/cpp/sca/runtime/extensions/python/src/Makefile.am b/cpp/sca/runtime/extensions/python/src/Makefile.am
index ec81dd5840..15d75f8c42 100644
--- a/cpp/sca/runtime/extensions/python/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/python/src/Makefile.am
@@ -52,9 +52,6 @@ INCLUDES = -Imodel -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \
            -I${PYTHON_INCLUDE}
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-                   
-
 moduledir=$(prefix)/extensions/python/module
 extension = libtuscany_sca_python$(libsuffix)
 	                    
@@ -63,4 +60,4 @@ install-exec-hook:
 	-rm -f  $(moduledir)/$(extension)
 	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)
 	-rm -f  $(libdir)/sca.so
-	$(LN_S) $(libdir)/libtuscany_sca_python$(libsuffix) $(libdir)/sca.so
\ No newline at end of file
+	$(LN_S) $(libdir)/libtuscany_sca_python$(libsuffix) $(libdir)/sca.so
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am b/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am
index 8007a89d13..a2b7ac74e4 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am
@@ -14,12 +14,10 @@ libtuscany_sca_rest_interface_la_LIBADD = \
 INCLUDES = -I$(top_builddir)/runtime/core/src \
   -I${TUSCANY_SDOCPP}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-      
 moduledir=$(prefix)/extensions/rest/interface/module
 extension = libtuscany_sca_rest_interface$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)             
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)             
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am b/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am
index 834853a6cf..f6e6c28b55 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am
@@ -19,13 +19,10 @@ INCLUDES = -I$(top_builddir)/runtime/core/src \
   -I${TUSCANY_SDOCPP}/include \
   -I${CURL_INCLUDE}
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
-
 moduledir=$(prefix)/extensions/rest/reference/module
 extension = libtuscany_sca_rest_reference$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am b/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am
index 49d11faee3..e5b3ce85bd 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am
@@ -33,12 +33,10 @@ INCLUDES = -I$(top_builddir)/runtime/core/src \
   -I${TUSCANY_SDOCPP}/include \
   -I${HTTPD_INCLUDE} -I${APR_INCLUDE}
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
 moduledir=$(prefix)/extensions/rest/service/module
 extension = libtuscany_sca_rest_service$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/ruby/src/Makefile.am b/cpp/sca/runtime/extensions/ruby/src/Makefile.am
index 50dd2d15b8..d9310440b9 100644
--- a/cpp/sca/runtime/extensions/ruby/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/ruby/src/Makefile.am
@@ -44,12 +44,10 @@ INCLUDES = -Imodel -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \
            -I${RUBY_INCLUDE}
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-                   
 moduledir=$(prefix)/extensions/ruby/module
 extension = libtuscany_sca_ruby_lang$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am b/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am
index ee1b9ea5e8..d5fdf775ca 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am
@@ -33,12 +33,10 @@ libtuscany_sca_binding_reference_la_LIBADD = \
 INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
 moduledir=$(prefix)/extensions/sca/reference/module
 extension = libtuscany_sca_binding_reference$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/sca/service/src/Makefile.am b/cpp/sca/runtime/extensions/sca/service/src/Makefile.am
index 2b062f199b..1136dba677 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/sca/service/src/Makefile.am
@@ -33,12 +33,10 @@ libtuscany_sca_binding_service_la_LIBADD = \
 INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
 moduledir=$(prefix)/extensions/sca/service/module
 extension = libtuscany_sca_binding_service$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am b/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
index 4996d72c77..fbf304f8c2 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
@@ -45,12 +45,10 @@ INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \
            -I${AXIS2C_HOME}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG                 
-
 moduledir=$(prefix)/extensions/ws/reference/module
 extension = libtuscany_sca_ws_reference$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am b/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
index 95924779da..88f7fc1a9e 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
+++ b/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
@@ -85,12 +85,10 @@ INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \
            -I${AXIS2C_HOME}/include
                    
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
-
 moduledir=$(prefix)/extensions/ws/service/module
 extension = libtuscany_sca_ws_service$(libsuffix)
 	                    
 install-exec-hook:
 	test -z $(moduledir) || $(mkdir_p) $(moduledir);
 	-rm -f  $(moduledir)/$(extension)
-	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
\ No newline at end of file
+	$(LN_S) $(libdir)/$(extension) $(moduledir)/$(extension)   
diff --git a/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am b/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
index 8c619b63bd..cfc5e8a661 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
+++ b/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
@@ -22,7 +22,6 @@ client_PROGRAMS = account_client
 client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh
 
-AM_CPPFLAGS = $(CPPFLAGS)
 account_client_SOURCES = AccountClient.cpp
 
 account_client_LDADD   =  -L${TUSCANY_SCACPP}/lib -ltuscany_sca \
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am b/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
index b51183d193..9782bf5041 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
+++ b/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
@@ -22,7 +22,6 @@ client_PROGRAMS = calculator_client
 client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh
 
-AM_CPPFLAGS = $(CPPFLAGS)
 calculator_client_SOURCES = \
 CalculatorClient.cpp
 
diff --git a/cpp/sdo/runtime/core/sdo_axiom/Makefile.am b/cpp/sdo/runtime/core/sdo_axiom/Makefile.am
index 87fda98097..ff6371212a 100644
--- a/cpp/sdo/runtime/core/sdo_axiom/Makefile.am
+++ b/cpp/sdo/runtime/core/sdo_axiom/Makefile.am
@@ -21,7 +21,6 @@ nobase_include_HEADERS = sdo_axiom.h \
 sdo_axiom_export.h
 
 lib_LTLIBRARIES = libtuscany_sdo_axiom.la
-AM_CPPFLAGS = $(CPPFLAGS)
 
 libtuscany_sdo_axiom_la_SOURCES = \
 	sdo_axiom.cpp
@@ -36,4 +35,4 @@ libtuscany_sdo_axiom_la_LIBADD = \
 INCLUDES = -I$(top_builddir)/runtime/core/src \
            -I$(top_builddir)/runtime/core/sdo_axiom  \
            -I${AXIS2C_HOME}/include
-     
\ No newline at end of file
+     
diff --git a/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am b/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am
index 96710534f7..636ad99c8b 100644
--- a/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am
+++ b/cpp/sdo/runtime/core/sdo_axiom_test/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS = tuscany_sdo_axiom_test
 SUBDIRS =
 TESTS = tuscany_sdo_axiom_test
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${LIBXML2_LIB}:$(AXIS2C_HOME)/lib
-AM_CPPFLAGS = $(CPPFLAGS)
 tuscany_sdo_axiom_test_SOURCES = sdo_axiom_test.cpp
 
 noinst_HEADERS=*.h
@@ -38,4 +37,4 @@ INCLUDES = -I$(top_builddir)/runtime/core/sdo_axiom_test \
            -I$(top_builddir)/runtime/core/src \
            -I$(top_builddir)/runtime/core/sdo_axiom  \
            -I${AXIS2C_HOME}/include
-            
\ No newline at end of file
+            
diff --git a/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am b/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am
index e5f316cc3d..bc5ecce789 100644
--- a/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am
+++ b/cpp/sdo/runtime/core/src/commonj/sdo/Makefile.am
@@ -16,7 +16,6 @@
 #  under the License.
 
 lib_LTLIBRARIES = libtuscany_sdo.la
-AM_CPPFLAGS = $(CPPFLAGS)
 
 libtuscany_sdo_la_SOURCES = \
 	ChangedDataObjectListImpl.cpp \
diff --git a/cpp/sdo/runtime/core/test/Makefile.am b/cpp/sdo/runtime/core/test/Makefile.am
index 060580dfbb..09994c5d5e 100644
--- a/cpp/sdo/runtime/core/test/Makefile.am
+++ b/cpp/sdo/runtime/core/test/Makefile.am
@@ -18,7 +18,6 @@
 noinst_PROGRAMS = tuscany_sdo_test
 SUBDIRS =
 TESTS=tuscany_sdo_test
-AM_CPPFLAGS = $(CPPFLAGS)
 tuscany_sdo_test_SOURCES = sdotest.cpp sdotest2.cpp utils.cpp main.cpp
 
 EXTRA_DIST = *.xsd *.xml *.txt *.wsdl test/*.* test2/*.* t2/*.* g/*.* bugs/1/*.*
diff --git a/cpp/sdo/samples/misc/Makefile.am b/cpp/sdo/samples/misc/Makefile.am
index 7ebcc44c59..c1cd5cde65 100644
--- a/cpp/sdo/samples/misc/Makefile.am
+++ b/cpp/sdo/samples/misc/Makefile.am
@@ -23,7 +23,6 @@ prgbin_SCRIPTS =
 EXTRA_DIST = *.xsd *.xml
 deploy_DATA = *.xsd *.xml
 
-AM_CPPFLAGS = $(CPPFLAGS)
 sdo_misc_SOURCES = samples.cpp \
 ChangeSummarySave.cpp \
 ObjectCreation.cpp \
-- 
cgit v1.2.3