svn commit: r814482 - in /tuscany/cpp/sca: runtime/core/src/Makefile.am samples/Makefile.am samples/configure.ac

[js...@apache.org]

Author: jsdelfino
Date: Mon Sep 14 05:55:17 2009
New Revision: 814482

URL: http://svn.apache.org/viewvc?rev=814482&view=rev
Log:
Adjusted makefiles and configure.ac to start to build the store sample.

Modified:
    tuscany/cpp/sca/runtime/core/src/Makefile.am
    tuscany/cpp/sca/samples/Makefile.am
    tuscany/cpp/sca/samples/configure.ac

Modified: tuscany/cpp/sca/runtime/core/src/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/runtime/core/src/Makefile.am?rev=814482&r1=814481&r2=814482&view=diff
==============================================================================
--- tuscany/cpp/sca/runtime/core/src/Makefile.am (original)
+++ tuscany/cpp/sca/runtime/core/src/Makefile.am Mon Sep 14 05:55:17 2009
@@ -18,6 +18,7 @@
 lib_LTLIBRARIES = libtuscany_sca.la
 
 nobase_include_HEADERS = \
+tuscany/*.hpp \
 tuscany/sca/*.h \
 tuscany/sca/core/*.h \
 tuscany/sca/model/*.h \

Modified: tuscany/cpp/sca/samples/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/Makefile.am?rev=814482&r1=814481&r2=814482&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/Makefile.am (original)
+++ tuscany/cpp/sca/samples/Makefile.am Mon Sep 14 05:55:17 2009
@@ -16,13 +16,13 @@
 #  under the License.
 
 if WANT_ALL_SAMPLES
-  CPP_SAMPLES = CppCalculator CppBigBank
+  CPP_SAMPLES = CppCalculator CppBigBank store
   PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator
   RUBY_SAMPLES = RubyCalculator RubyBigBank HttpdBigBank RestCalculator
   PYTHON_RUBY_SAMPLES = RestYahoo
 else
 if WANT_CPP_SAMPLES
-    CPP_SAMPLES = CppCalculator CppBigBank
+    CPP_SAMPLES = CppCalculator CppBigBank store
 endif
 if WANT_PYTHON_SAMPLES
     PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator

Modified: tuscany/cpp/sca/samples/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/configure.ac?rev=814482&r1=814481&r2=814482&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/configure.ac (original)
+++ tuscany/cpp/sca/samples/configure.ac Mon Sep 14 05:55:17 2009
@@ -79,6 +79,20 @@
   AC_SUBST([TUSCANY_SDOCPP], ["$SCAPWD/../../sdo/deploy"])
 fi
 
+# Configure LIBXML2_INCLUDE and LIBXML2_LIB
+LIBXML2_INCLUDE=`echo "$LIBXML2_INCLUDE"`
+if test "x$LIBXML2_INCLUDE" = "x"; then
+  AC_SUBST([LIBXML2_INCLUDE], ["/usr/include/libxml2"])
+fi
+
+LIBXML2_LIB=`echo "$LIBXML2_LIB"`
+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 samples)
 AC_ARG_ENABLE(all-samples, [AS_HELP_STRING([--enable-all-samples],[build all samples [default=no]])],
 [ case "${enableval}" in
@@ -148,6 +162,7 @@
 AM_CONDITIONAL([WANT_RUBY_SAMPLES], [test x$want_ruby_samples = xtrue])
 
 AC_CONFIG_FILES([Makefile  
+                 store/Makefile
                  AlertAggregator/Makefile
                  AlertAggregator/sample.alerter/Makefile
                  AlertAggregator/sample.display/Makefile