You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/03/01 11:13:34 UTC
svn commit: r917441 - in /tuscany/sca-cpp/trunk: modules/java/Makefile.am
modules/python/Makefile.am modules/server/Makefile.am
test/store-java/Makefile.am
Author: jsdelfino
Date: Mon Mar 1 10:13:34 2010
New Revision: 917441
URL: http://svn.apache.org/viewvc?rev=917441&view=rev
Log:
Fixed build bootstrap error with duplicate variable definitions.
Modified:
tuscany/sca-cpp/trunk/modules/java/Makefile.am
tuscany/sca-cpp/trunk/modules/python/Makefile.am
tuscany/sca-cpp/trunk/modules/server/Makefile.am
tuscany/sca-cpp/trunk/test/store-java/Makefile.am
Modified: tuscany/sca-cpp/trunk/modules/java/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/Makefile.am?rev=917441&r1=917440&r2=917441&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/java/Makefile.am Mon Mar 1 10:13:34 2010
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-libdir = $(prefix)/modules/java
JAVAROOT = $(top_builddir)/modules/java
+libdir = $(prefix)/modules/java
if WANT_JAVA
Modified: tuscany/sca-cpp/trunk/modules/python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/Makefile.am?rev=917441&r1=917440&r2=917441&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/python/Makefile.am Mon Mar 1 10:13:34 2010
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-libdir=$(prefix)/modules/python
+libdir = $(prefix)/modules/python
if WANT_PYTHON
@@ -28,7 +28,7 @@
xsddir = $(prefix)/xsd
prefix_DATA = python.prefix
-prefixdir=$(prefix)/modules/python
+prefixdir = $(prefix)/modules/python
python.prefix: $(top_builddir)/config.status
echo ${PYTHON_PREFIX} >python.prefix
Modified: tuscany/sca-cpp/trunk/modules/server/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/Makefile.am?rev=917441&r1=917440&r2=917441&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/server/Makefile.am Mon Mar 1 10:13:34 2010
@@ -21,7 +21,7 @@
moddir = $(prefix)/modules/server
lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
-libdir=$(prefix)/modules/server
+libdir = $(prefix)/modules/server
noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
libmod_tuscany_eval_la_SOURCES = mod-eval.cpp
Modified: tuscany/sca-cpp/trunk/test/store-java/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/Makefile.am?rev=917441&r1=917440&r2=917441&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-java/Makefile.am Mon Mar 1 10:13:34 2010
@@ -15,12 +15,12 @@
# specific language governing permissions and limitations
# under the License.
+JAVAROOT = ${top_builddir}/test/store-java
+
if WANT_JAVA
AM_JAVACFLAGS = -cp ${top_builddir}/modules/java/libmod-tuscany-java-${PACKAGE_VERSION}.jar:${JAVAROOT}
-JAVAROOT = ${top_builddir}/test/store-java
-
noinst_JAVA = store/*.java
CLEANFILES = store/*.class