You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2004/04/05 15:51:10 UTC
cvs commit: ws-axis/c/src/transport/axis Makefile.am
damitha 2004/04/05 06:51:10
Modified: c configure.ac
c/src/common Makefile.am
c/src/soap Makefile.am
c/src/wsdd Makefile.am
c/src/xml Makefile.am
c/src/wcg Makefile.am
c/src/engine/server Makefile.am
c/src/engine/client Makefile.am
c/src/transport/axis Makefile.am
Log:
This change is done so that all the cpp flags and ld flags common to all Makefile.am's are moved to configure.ac. This is done since this is very useful feature. This should not affect the functionality of the code.
Revision Changes Path
1.8 +4 -3 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 27 Mar 2004 06:11:13 -0000 1.7
+++ configure.ac 5 Apr 2004 13:51:09 -0000 1.8
@@ -2,15 +2,16 @@
AM_INIT_AUTOMAKE(0.3)
AM_CONFIG_HEADER(config.h)
CFLAGS="-Wall -Wshadow"
-LDFLAGS="-s"
+CPPFLAGS="-Wall -Wshadow -DUSE_EXPAT_PARSER"
+LDFLAGS="-s -L$AXISCPP_HOME/lib/expat -lexpat -lstdc++"
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-#AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache/Makefile)
#if you use apache2
-AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache2/Makefile)
+#AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache2/Makefile)
1.14 +2 -2 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am 30 Mar 2004 10:47:48 -0000 1.13
+++ Makefile.am 5 Apr 2004 13:51:09 -0000 1.14
@@ -1,9 +1,9 @@
noinst_LTLIBRARIES = libcommon.la
-AM_CPPFLAGS = -Wall -DUSE_EXPAT_PARSER
+AM_CPPFLAGS = $(CPPFLAGS)
libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp \
BasicTypeSerializer.cpp ArrayBean.cpp AxisTime.cpp \
GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp \
AxisSocketUtils.cpp AdminUtils.cpp
-libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib/expat -lexpat -lstdc++
+libcommon_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +2 -2 ws-axis/c/src/soap/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 31 Mar 2004 15:06:19 -0000 1.6
+++ Makefile.am 5 Apr 2004 13:51:09 -0000 1.7
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libsoap.la
-AM_CPPFLAGS = -Wall -DUSE_EXPAT_PARSER
+AM_CPPFLAGS = $(CPPFLAGS)
libsoap_la_SOURCES = Attribute.cpp \
BasicNode.cpp \
CharacterElement.cpp \
@@ -19,5 +19,5 @@
apr_base64.c \
HexCoder.cpp
-libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/expat -lexpat
+libsoap_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.8 +2 -2 ws-axis/c/src/wsdd/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 30 Mar 2004 10:47:49 -0000 1.7
+++ Makefile.am 5 Apr 2004 13:51:09 -0000 1.8
@@ -1,5 +1,5 @@
noinst_LTLIBRARIES = libwsdd.la
-AM_CPPFLAGS = -Wall -DUSE_EXPAT_PARSER
+AM_CPPFLAGS = $(CPPFLAGS)
libwsdd_la_SOURCES = WSDDDeployment.cpp \
WSDDHandler.cpp \
WSDDService.cpp \
@@ -7,5 +7,5 @@
WSDDDocumentExpat.cpp \
WSDDKeywords.cpp
-libwsdd_la_LIBADD = -L$(AXISCPP_HOME)/lib/expat -lexpat
+libwsdd_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +1 -1 ws-axis/c/src/xml/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 27 Mar 2004 15:07:13 -0000 1.6
+++ Makefile.am 5 Apr 2004 13:51:09 -0000 1.7
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxml.la
-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
+AM_CPPFLAGS = $(CPPFLAGS)
libxml_la_SOURCES = QName.cpp Element.cpp Event.cpp StartElement.cpp SimpleAttribute.cpp
INCLUDES = -I$(AXISCPP_HOME)/include
1.2 +1 -1 ws-axis/c/src/wcg/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 12 Sep 2003 09:31:43 -0000 1.1
+++ Makefile.am 5 Apr 2004 13:51:10 -0000 1.2
@@ -1,6 +1,6 @@
bin_PROGRAMS = wcg
SUBDIRS =
-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
+AM_CPPFLAGS = $(CPPFLAGS)
wcg_SOURCES = actions.cpp BeanClass.cpp Deploy.cpp File.cpp TranslationUnit.cpp \
Variable.cpp WCGenerator.cpp WSClass.cpp cpplex.cpp cppyacc.cpp \
Method.cpp
1.4 +2 -2 ws-axis/c/src/engine/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 26 Mar 2004 08:56:31 -0000 1.3
+++ Makefile.am 5 Apr 2004 13:51:10 -0000 1.4
@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libserver_engine.la
-AM_CPPFLAGS = -Wall -DUSE_EXPAT_PARSER -DUSE_LTDL
+AM_CPPFLAGS = $(CPPFLAGS) -DUSE_LTDL
libserver_engine_la_SOURCES = ../Axis.cpp \
ServerAxisEngine.cpp \
../AxisEngine.cpp \
@@ -13,5 +13,5 @@
../SessionScopeHandlerPool.cpp \
../SharedObject.cpp
-libserver_engine_la_LIBADD = ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la -L$(AXISCPP_HOME)/lib/expat -lexpat -lstdc++
+libserver_engine_la_LIBADD = $(LDFLAGS) ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la
INCLUDES = -I$(AXISCPP_HOME)/include
1.8 +2 -2 ws-axis/c/src/engine/client/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 27 Mar 2004 15:05:45 -0000 1.7
+++ Makefile.am 5 Apr 2004 13:51:10 -0000 1.8
@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libaxiscpp_client.la
-AM_CPPFLAGS = -Wall -DUSE_EXPAT_PARSER -DUSE_LTDL -DAXIS_CLIENT_LIB
+AM_CPPFLAGS = $(CPPFLAGS) -DUSE_LTDL -DAXIS_CLIENT_LIB
libaxiscpp_client_la_SOURCES = ../Axis.cpp \
ClientAxisEngine.cpp \
../AxisEngine.cpp \
@@ -14,5 +14,5 @@
../SharedObject.cpp \
Call.cpp
-libaxiscpp_client_la_LIBADD = ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la ../../transport/axis/libtransport.la -L$(AXISCPP_HOME)/lib/expat -lexpat -lstdc++
+libaxiscpp_client_la_LIBADD = $(LDFLAGS) ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la ../../transport/axis/libtransport.la
INCLUDES = -I$(AXISCPP_HOME)/include
1.9 +1 -1 ws-axis/c/src/transport/axis/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 28 Jan 2004 06:40:52 -0000 1.8
+++ Makefile.am 5 Apr 2004 13:51:10 -0000 1.9
@@ -1,5 +1,5 @@
noinst_LTLIBRARIES = libtransport.la
-AM_CPPFLAGS = -Wshadow -Wall -pedantic
+AM_CPPFLAGS = $(CPPFLAGS)
libtransport_la_SOURCES = Channel.cpp HttpTransport.cpp Receiver.cpp Sender.cpp \
Transport.cpp TransportFactory.cpp Url.cpp AxisTransport.cpp