Modified: tuscany/sca-cpp/trunk/doc/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/doc/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/doc/Makefile.am (original) +++ tuscany/sca-cpp/trunk/doc/Makefile.am Mon Nov 23 05:48:11 2009 @@ -26,10 +26,5 @@ datadir=$(prefix)/doc -data_DATA = *.html -nobase_data_DATA = css/*.* - -EXTRA_DIST = css *.html - clean: rm -rf doxygen
Modified: tuscany/sca-cpp/trunk/etc/git-exclude URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/git-exclude?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/etc/git-exclude (original) +++ tuscany/sca-cpp/trunk/etc/git-exclude Mon Nov 23 05:48:11 2009 @@ -30,6 +30,7 @@ Makefile .deps/ .libs/ +m4/ *.m4 config.guess config.sub @@ -56,6 +57,7 @@ gmon.out *~ tags +doxygen # Specific ignores sca/runtime/extensions/cpp/tools/scagen/docs/ @@ -67,8 +69,9 @@ eval-test eval-shell json-test -diskcache-test -memcache-test +cache-test +client-test +mcache-test curl-test scdl-test store-function-test Modified: tuscany/sca-cpp/trunk/modules/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/Makefile.am Mon Nov 23 05:48:11 2009 @@ -15,5 +15,8 @@ # specific language governing permissions and limitations # under the License. -SUBDIRS = atom cache eval http json scdl +SUBDIRS = atom eval http json scdl server + +includedir = $(prefix)/include/modules +nobase_include_HEADERS = */*.hpp Modified: tuscany/sca-cpp/trunk/modules/atom/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/atom/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/atom/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/atom/Makefile.am Mon Nov 23 05:48:11 2009 @@ -17,8 +17,6 @@ noinst_PROGRAMS = atom-test -nobase_include_HEADERS = *.hpp - INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} atom_test_SOURCES = atom-test.cpp Modified: tuscany/sca-cpp/trunk/modules/eval/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/eval/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/eval/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/eval/Makefile.am Mon Nov 23 05:48:11 2009 @@ -20,8 +20,6 @@ datadir=$(prefix)/modules/eval nobase_data_DATA = *.xsd -nobase_include_HEADERS = *.hpp - INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} eval_test_SOURCES = eval-test.cpp Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Mon Nov 23 05:48:11 2009 @@ -17,21 +17,9 @@ noinst_PROGRAMS = curl-test -libdir=$(prefix)/lib -lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la - -nobase_include_HEADERS = *.hpp - -INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${HTTPD_INCLUDE} -I${APR_INCLUDE} -I${LIBMOZJS_INCLUDE} -I${CURL_INCLUDE} - -libmod_tuscany_eval_la_SOURCES = mod-eval.cpp -libmod_tuscany_eval_la_LIBADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${CURL_LIB} -lcurl -L${LIBMOZJS_LIB} -lmozjs - -libmod_tuscany_wiring_la_SOURCES = mod-wiring.cpp -libmod_tuscany_wiring_la_LIBADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${CURL_LIB} -lcurl -L${LIBMOZJS_LIB} -lmozjs +INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${HTTPD_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE} -I${CURL_INCLUDE} curl_test_SOURCES = curl-test.cpp -curl_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${CURL_LIB} -lcurl -L${LIBMOZJS_LIB} -lmozjs - -TESTS = httpd-test http-test wiring-test +curl_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${CURL_LIB} -lcurl -L${JS_LIB} -lmozjs +TESTS = httpd-test http-test Modified: tuscany/sca-cpp/trunk/modules/json/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/json/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/json/Makefile.am Mon Nov 23 05:48:11 2009 @@ -17,12 +17,10 @@ noinst_PROGRAMS = json-test -nobase_include_HEADERS = *.hpp - -INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${LIBMOZJS_INCLUDE} +INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE} json_test_SOURCES = json-test.cpp -json_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${LIBMOZJS_LIB} -lmozjs +json_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs TESTS = json-test Modified: tuscany/sca-cpp/trunk/modules/scdl/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scdl/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/scdl/Makefile.am Mon Nov 23 05:48:11 2009 @@ -17,8 +17,6 @@ noinst_PROGRAMS = scdl-test -nobase_include_HEADERS = *.hpp - INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} scdl_test_SOURCES = scdl-test.cpp Modified: tuscany/sca-cpp/trunk/test/store-function/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-function/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/test/store-function/Makefile.am (original) +++ tuscany/sca-cpp/trunk/test/store-function/Makefile.am Mon Nov 23 05:48:11 2009 @@ -15,18 +15,14 @@ # specific language governing permissions and limitations # under the License. -store_function_PROGRAMS = store-function-test -store_functiondir=$(prefix)/test/store-function/deploy +noinst_PROGRAMS = store-function-test -nobase_include_HEADERS = *.hpp +noinst_HEADERS = *.hpp INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} store_function_test_SOURCES = store-function-test.cpp store_function_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -EXTRA_DIST = *.composite -store_function_DATA = *.composite - TESTS = store-function-test Modified: tuscany/sca-cpp/trunk/test/store-object/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-object/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/test/store-object/Makefile.am (original) +++ tuscany/sca-cpp/trunk/test/store-object/Makefile.am Mon Nov 23 05:48:11 2009 @@ -15,18 +15,14 @@ # specific language governing permissions and limitations # under the License. -store_object_PROGRAMS = store-object-test -store_objectdir=$(prefix)/test/store-object/deploy +noinst_PROGRAMS = store-object-test -nobase_include_HEADERS = *.hpp +noinst_HEADERS = *.hpp INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} store_object_test_SOURCES = store-object-test.cpp store_object_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -EXTRA_DIST = *.composite -store_object_DATA = *.composite - TESTS = store-object-test Modified: tuscany/sca-cpp/trunk/test/store-script/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-script/Makefile.am?rev=883254&r1=883253&r2=883254&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/test/store-script/Makefile.am (original) +++ tuscany/sca-cpp/trunk/test/store-script/Makefile.am Mon Nov 23 05:48:11 2009 @@ -15,16 +15,12 @@ # specific language governing permissions and limitations # under the License. -store_script_PROGRAMS = store-script-test -store_scriptdir=$(prefix)/test/store-script/deploy +noinst_PROGRAMS = store-script-test -INCLUDES = -I. -I$(top_builddir)/kernel -I$(top_builddir)/modules/eval -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${LIBMOZJS_INCLUDE} +INCLUDES = -I. -I$(top_builddir)/kernel -I$(top_builddir)/modules/eval -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE} store_script_test_SOURCES = store-script-test.cpp -store_script_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${LIBMOZJS_LIB} -lmozjs +store_script_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs -EXTRA_DIST = *.composite -store_script_DATA = *.composite - TESTS = store-script-test store-http-test
