Author: ajborley
Date: Wed Oct 11 05:35:58 2006
New Revision: 462787
URL: http://svn.apache.org/viewvc?view=rev&rev=462787
Log:
Updated Makefiles so that scagen runs at the right time and make bindist
chooses the correct files to distribute
Modified:
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am?view=diff&rev=462787&r1=462786&r2=462787
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am
(original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am Wed
Oct 11 05:35:58 2006
@@ -1,37 +1,31 @@
deploydir=$(prefix)/samples/BigBank/deploy
compositedir=$(deploydir)/bigbank.account
-BUILT_SOURCES = AccountDataServiceImpl_AccountDataService_Proxy.cpp \
-AccountDataServiceImpl_AccountDataService_Wrapper.cpp \
-AccountServiceImpl_accountDataService_Proxy.cpp \
-AccountServiceImpl_AccountService_Proxy.cpp \
-AccountServiceImpl_AccountService_Wrapper.cpp \
-AccountServiceImpl_stockQuoteService_Proxy.cpp \
-StockQuoteServiceImpl_StockQuoteService_Proxy.cpp \
-StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp \
-StockQuoteServiceImpl_webService_Proxy.cpp
+BUILT_SOURCES = scagen
noinst_HEADERS = *.h
composite_SCRIPTS = runwsserver.sh
-${BUILT_SOURCES}: bigbank.account.composite
+scagen:
java -jar $(TUSCANY_SCACPP)/bin/scagen.jar -dir . -output .
composite_LTLIBRARIES = libAccount.la
composite_DATA = *.composite *.componentType *.wsdl *.xsd
EXTRA_DIST = *.composite *.componentType *.wsdl *.xsd runwsserver.sh
-libAccount_la_SOURCES = \
+dist_libAccount_la_SOURCES = \
+AccountDataServiceImpl.cpp \
+AccountServiceImpl.cpp \
+StockQuoteServiceImpl.cpp
+
+nodist_libAccount_la_SOURCES = \
AccountDataServiceImpl_AccountDataService_Proxy.cpp \
AccountDataServiceImpl_AccountDataService_Wrapper.cpp \
-AccountDataServiceImpl.cpp \
AccountServiceImpl_accountDataService_Proxy.cpp \
AccountServiceImpl_AccountService_Proxy.cpp \
AccountServiceImpl_AccountService_Wrapper.cpp \
-AccountServiceImpl.cpp \
AccountServiceImpl_stockQuoteService_Proxy.cpp \
-StockQuoteServiceImpl.cpp \
StockQuoteServiceImpl_StockQuoteService_Proxy.cpp \
StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp \
StockQuoteServiceImpl_webService_Proxy.cpp
Modified:
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am?view=diff&rev=462787&r1=462786&r2=462787
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
(original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
Wed Oct 11 05:35:58 2006
@@ -1,16 +1,12 @@
deploydir=$(prefix)/samples/Calculator/deploy
compositedir=$(deploydir)/sample.calculator
-BUILT_SOURCES = CalculatorImpl_CalculatorService_Proxy.cpp \
-CalculatorImpl_CalculatorService_Wrapper.cpp \
-CalculatorImpl_divideService_Proxy.cpp \
-DivideImpl_DivideService_Proxy.cpp \
-DivideImpl_DivideService_Wrapper.cpp
+BUILT_SOURCES = scagen
noinst_HEADERS = *.h
-${BUILT_SOURCES}: sample.calculator.composite
- java -jar $(TUSCANY_SCACPP)/bin/scagen.jar -dir . -output .
+scagen:
+ java -jar $(TUSCANY_SCACPP)/bin/scagen.jar -dir . -output .
composite_SCRIPTS = runwsserver.sh
@@ -18,12 +14,14 @@
composite_DATA = *.composite *.componentType *.wsdl
EXTRA_DIST = *.composite *.componentType *.wsdl runwsserver.sh
-libCalculator_la_SOURCES = \
+dist_libCalculator_la_SOURCES = \
CalculatorImpl.cpp \
+DivideImpl.cpp
+
+nodist_libCalculator_la_SOURCES = \
CalculatorImpl_CalculatorService_Proxy.cpp \
CalculatorImpl_CalculatorService_Wrapper.cpp \
CalculatorImpl_divideService_Proxy.cpp \
-DivideImpl.cpp \
DivideImpl_DivideService_Proxy.cpp \
DivideImpl_DivideService_Wrapper.cpp
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
