diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-14 05:55:17 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-14 05:55:17 +0000 |
| commit | 1f1af3587a9a9f666c3faa76a651553c292ebc40 (patch) | |
| tree | 4dc362816031da471cc3bf4bb3fb52f31d3903d4 | |
| parent | 67618c80483e01793351b20cbbbc5a56a6a8f016 (diff) | |
Adjusted makefiles and configure.ac to start to build the store sample.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814482 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/sca/runtime/core/src/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/sca/samples/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/sca/samples/configure.ac | 15 |
3 files changed, 18 insertions, 2 deletions
diff --git a/cpp/sca/runtime/core/src/Makefile.am b/cpp/sca/runtime/core/src/Makefile.am index ebba243583..63c0a1e083 100644 --- a/cpp/sca/runtime/core/src/Makefile.am +++ b/cpp/sca/runtime/core/src/Makefile.am @@ -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 \ diff --git a/cpp/sca/samples/Makefile.am b/cpp/sca/samples/Makefile.am index 0fdf524cc1..66c4cd260a 100644 --- a/cpp/sca/samples/Makefile.am +++ b/cpp/sca/samples/Makefile.am @@ -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 diff --git a/cpp/sca/samples/configure.ac b/cpp/sca/samples/configure.ac index 2131e8dcc8..e03204ba66 100644 --- a/cpp/sca/samples/configure.ac +++ b/cpp/sca/samples/configure.ac @@ -79,6 +79,20 @@ if test "x$TUSCANY_SDOCPP" = "x"; then 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 @@ AC_ARG_ENABLE(ruby, [AS_HELP_STRING([--enable-ruby],[build Ruby samples [default 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 |