diff options
Diffstat (limited to 'sca-cpp/trunk/modules')
-rw-r--r-- | sca-cpp/trunk/modules/http/Makefile.am | 7 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/java/Makefile.am | 4 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/python/Makefile.am | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/server/Makefile.am | 10 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/server/domain-test.composite | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/wsgi/Makefile.am | 4 |
6 files changed, 18 insertions, 11 deletions
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am index 180529620c..04a60dbd0d 100644 --- a/sca-cpp/trunk/modules/http/Makefile.am +++ b/sca-cpp/trunk/modules/http/Makefile.am @@ -17,14 +17,15 @@ INCLUDES = -I${HTTPD_INCLUDE} +mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf moddir=$(prefix)/modules/http -mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart curl_test_SOURCES = curl-test.cpp curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs -prefix_DATA = httpd.prefix curl.prefix -prefixdir=$(prefix)/modules/http +mod_DATA = httpd.prefix curl.prefix +nobase_mod_DATA = conf/* + httpd.prefix: $(top_builddir)/config.status echo ${HTTPD_PREFIX} >httpd.prefix curl.prefix: $(top_builddir)/config.status diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am index 293b9431b5..d377f570c6 100644 --- a/sca-cpp/trunk/modules/java/Makefile.am +++ b/sca-cpp/trunk/modules/java/Makefile.am @@ -35,7 +35,7 @@ libmod_tuscany_java_la_SOURCES = mod-java.cpp libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs ${JAVA_LDFLAGS} noinst_DATA = libmod_tuscany_java.so libmod_tuscany_java.so: - ln -s .libs/libmod_tuscany_java.so libmod_tuscany_java.so + ln -s .libs/libmod_tuscany_java.so jni_test_SOURCES = jni-test.cpp jni_test_LDFLAGS = ${JAVA_LDFLAGS} @@ -53,7 +53,7 @@ jar_DATA = ${jarfile} ${jarfile}: ${noinst_JAVA} ${JAR} cf $@ org/apache/tuscany/*.class -CLEANFILES = ${jarfile} org/apache/tuscany/*.class test/*.class +CLEANFILES = classnoinst.stamp ${jarfile} org/apache/tuscany/*.class test/*.class client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs diff --git a/sca-cpp/trunk/modules/python/Makefile.am b/sca-cpp/trunk/modules/python/Makefile.am index c4e7b038e1..0e49cdfaad 100644 --- a/sca-cpp/trunk/modules/python/Makefile.am +++ b/sca-cpp/trunk/modules/python/Makefile.am @@ -37,7 +37,7 @@ libmod_tuscany_python_la_SOURCES = mod-python.cpp libmod_tuscany_python_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6 noinst_DATA = libmod_tuscany_python.so libmod_tuscany_python.so: - ln -s .libs/libmod_tuscany_python.so libmod_tuscany_python.so + ln -s .libs/libmod_tuscany_python.so python_test_SOURCES = python-test.cpp python_test_LDFLAGS = -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6 diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am index 06323aad05..a14382e114 100644 --- a/sca-cpp/trunk/modules/server/Makefile.am +++ b/sca-cpp/trunk/modules/server/Makefile.am @@ -27,16 +27,20 @@ noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so libmod_tuscany_eval_la_SOURCES = mod-eval.cpp libmod_tuscany_eval_la_LDFLAGS = -lxml2 -lcurl -lmozjs libmod_tuscany_eval.so: - ln -s .libs/libmod_tuscany_eval.so libmod_tuscany_eval.so + ln -s .libs/libmod_tuscany_eval.so libmod_tuscany_wiring_la_SOURCES = mod-wiring.cpp libmod_tuscany_wiring_la_LDFLAGS = -lxml2 -lcurl -lmozjs libmod_tuscany_wiring.so: - ln -s .libs/libmod_tuscany_wiring.so libmod_tuscany_wiring.so + ln -s .libs/libmod_tuscany_wiring.so -noinst_testdir = $(prefix)/test noinst_test_LTLIBRARIES = libimpl-test.la +noinst_testdir = `pwd`/tmp +noinst_DATA += libimpl-test.so + libimpl_test_la_SOURCES = impl-test.cpp +libimpl-test.so: + ln -s .libs/libimpl-test.so client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs diff --git a/sca-cpp/trunk/modules/server/domain-test.composite b/sca-cpp/trunk/modules/server/domain-test.composite index ef85bb919b..048c451ef6 100644 --- a/sca-cpp/trunk/modules/server/domain-test.composite +++ b/sca-cpp/trunk/modules/server/domain-test.composite @@ -30,7 +30,7 @@ </component> <component name="cpp-test"> - <implementation.cpp path=".libs" library="libimpl-test"/> + <implementation.cpp path="." library="libimpl-test"/> <service name="cpp"> <t:binding.http uri="cpp"/> </service> diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am index 7678104761..9a8895bcab 100644 --- a/sca-cpp/trunk/modules/wsgi/Makefile.am +++ b/sca-cpp/trunk/modules/wsgi/Makefile.am @@ -19,9 +19,11 @@ if WANT_PYTHON INCLUDES = -I${PYTHON_INCLUDE} -mod_SCRIPTS = composite.py scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py wsgi-start wsgi-stop +mod_SCRIPTS = composite.py wsgi-start wsgi-stop gae-start gae-stop moddir = $(prefix)/modules/wsgi +mod_DATA = app.yaml scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py + noinst_DATA = target.stamp target.stamp: app.yaml *.py *.composite htdocs/* |