You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2006/09/28 11:05:43 UTC
svn commit: r450766 - in /webservices/axis2/trunk/c: ./ axiom/ guththila/
rampart/ tools/codegen/ tools/codegen/src/ tools/codegen/src/schema/
tools/codegen/src/schema/compiler/ tools/codegen/src/schema/writer/
tools/codegen/src/util/ tools/codegen/src...
Author: pini
Date: Thu Sep 28 02:05:38 2006
New Revision: 450766
URL: http://svn.apache.org/viewvc?view=rev&rev=450766
Log:
Added codegen to main build.
Removed:
webservices/axis2/trunk/c/build_all.sh
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/autogen.sh
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/guththila/configure.ac
webservices/axis2/trunk/c/rampart/configure.ac
webservices/axis2/trunk/c/tools/codegen/configure.ac
webservices/axis2/trunk/c/tools/codegen/src/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/wsdl/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/Makefile.am
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/Makefile.am
webservices/axis2/trunk/c/woden/configure.ac
webservices/axis2/trunk/c/xml_schema/configure.ac
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Thu Sep 28 02:05:38 2006
@@ -1,7 +1,7 @@
datadir=$(prefix)
logsdir=$(prefix)/logs
docsdir=$(prefix)/docs
-SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart $(TESTDIR) include ides
+SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart tools/codegen $(TESTDIR) include ides
include_HEADERS=$(top_builddir)/include/*.h
data_DATA= samples/server/axis2.xml README \
INSTALL CREDITS COPYING NEWS config.guess missing install-sh depcomp config.sub ltmain.sh
Modified: webservices/axis2/trunk/c/autogen.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/autogen.sh?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/autogen.sh (original)
+++ webservices/axis2/trunk/c/autogen.sh Thu Sep 28 02:05:38 2006
@@ -23,8 +23,16 @@
cd ../rampart
./autogen.sh
+echo 'Running autogen.sh in Codegen'
+cd ../tools/codegen
+./autogen.sh
+
+echo 'Running autogen.sh in TCPmon'
+cd ../../tools/tcpmon
+./autogen.sh
+
echo 'Running autogen.sh in Axis2/C'
-cd ..
+cd ../..
echo -n 'Running libtoolize...'
if libtoolize --force > /dev/null 2>&1; then
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Thu Sep 28 02:05:38 2006
@@ -85,29 +85,6 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=no],
[ case "${enableval}" in
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Sep 28 02:05:38 2006
@@ -42,6 +42,13 @@
AC_CONFIG_SUBDIRS(rampart)
fi
+if test -d $srcdir/tools/codegen; then
+ AC_CONFIG_SUBDIRS(tools/codegen)
+fi
+
+if test -d $srcdir/tools/tcpmon; then
+ AC_CONFIG_SUBDIRS(tools/tcpmon)
+fi
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
Modified: webservices/axis2/trunk/c/guththila/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/guththila/configure.ac (original)
+++ webservices/axis2/trunk/c/guththila/configure.ac Thu Sep 28 02:05:38 2006
@@ -38,29 +38,6 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
UTILINC=$axis2_utilinc
Modified: webservices/axis2/trunk/c/rampart/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/rampart/configure.ac (original)
+++ webservices/axis2/trunk/c/rampart/configure.ac Thu Sep 28 02:05:38 2006
@@ -39,52 +39,6 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] use axiom.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axiom include dir in the path
- if test -d $withval; then
- axiominc="-I$withval"
- dnl else find the axiom include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axiom. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AXIOMINC=$axiominc
UTILINC=$axis2_utilinc
Modified: webservices/axis2/trunk/c/tools/codegen/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/codegen/configure.ac Thu Sep 28 02:05:38 2006
@@ -46,6 +46,37 @@
PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
PKG_CHECK_MODULES(LIBXSLT, libxslt)
+AC_MSG_CHECKING(whether to build libxml2 xml parser library)
+AC_ARG_ENABLE(libxml2, [ --enable-libxml2 build libxml2 xml parser library wrapper. default=yes],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ PARSER_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ PARSER_DIR="libxml2"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ PARSER_DIR="libxml2"
+)
+
+AC_MSG_CHECKING(whether to build guththila xml parser library)
+AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=no],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ PARSER_DIR="guththila"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
AC_MSG_CHECKING(To Use Axis2/C Util. This is a compulsory module to build Axis2/C)
AC_ARG_WITH(axis2_util,
@@ -176,6 +207,7 @@
AC_SUBST(XMLSCHEMAINC)
AC_SUBST(WODENINC)
AC_SUBST(TESTDIR)
+AC_SUBST(PARSER_DIR)
CFLAGS="$CFLAGS $LIBXML2_CFLAGS $LIBXSLT_CFLAGS"
@@ -195,11 +227,7 @@
test/Makefile \
test/unit/Makefile \
test/unit/util/Makefile \
- test/unit/codegen/Makefile \
- samples/client/calculator/Makefile \
- samples/server/calculator/Makefile \
- samples/client/interop_test_svc/Makefile \
- samples/server/interop_test_svc/Makefile \
+ test/unit/codegen/Makefile
])
AC_OUTPUT
Modified: webservices/axis2/trunk/c/tools/codegen/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/Makefile.am Thu Sep 28 02:05:38 2006
@@ -11,16 +11,20 @@
$(top_builddir)/src/wsdl/libw2c_codegen.la \
-L$(AXIS2C_HOME)/lib \
-lw2c_codegen \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
-lxml2 \
-lxslt
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la
+
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include \
+ -I ../../../xml_schema/include \
+ -I ../../../include
#install:install-recursive
# cp templates $(templatesdir) -rf
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am Thu Sep 28 02:05:38 2006
@@ -9,11 +9,11 @@
x2c_LDADD = \
$(top_builddir)/src/wsdl/libw2c_codegen.la \
$(top_builddir)/src/schema/compiler/libw2c_schema.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
-lxml2 \
-lxslt \
$(NULL)
@@ -26,15 +26,16 @@
libw2c_databinding_adb_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
$(top_builddir)/src/schema/compiler/libw2c_schema.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -lwoden_wsdl \
- -lwoden \
- -laxis2_xml_schema
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../woden/src/wsdl/libwoden_wsdl.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @XMLSCHEMAINC@ \
- @AXIOMINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include \
+ -I ../../../../xml_schema/include \
+ -I ../../../../woden/include \
+ -I ../../../../include
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am Thu Sep 28 02:05:38 2006
@@ -12,13 +12,13 @@
libw2c_schema_la_LIBADD = \
$(top_builddir)/src/wsdl/libw2c_codegen.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_xml_schema
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @XMLSCHEMAINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include \
+ -I ../../../../../xml_schema/include
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am Thu Sep 28 02:05:38 2006
@@ -8,13 +8,12 @@
libw2c_schema_c_writer_la_LIBADD = \
$(top_builddir)/src/schema/compiler/libw2c_schema.la \
$(top_builddir)/src/wsdl/libw2c_codegen.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_xml_schema
-
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @XMLSCHEMAINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include \
+ -I ../../../../../xml_schema/include
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am Thu Sep 28 02:05:38 2006
@@ -20,14 +20,14 @@
libw2c_util_la_LIBADD = \
- -L$(AXIS2C_HOME)/lib \
-lxml2 -lxslt \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
$(NULL)
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/Makefile.am Thu Sep 28 02:05:38 2006
@@ -10,10 +10,12 @@
libw2c_codegen_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
-L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/Makefile.am Thu Sep 28 02:05:38 2006
@@ -5,19 +5,18 @@
libw2c_emitter_if_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_xml_schema \
- -lwoden_wsdl \
- -lwoden \
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../../woden/src/wsdl/libwoden_wsdl.la \
$(NULL)
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@ \
- @WODENINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include \
+ -I ../../../../../woden/include
prglib_LTLIBRARIES = \
libw2c_c_emitter.la
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/Makefile.am Thu Sep 28 02:05:38 2006
@@ -16,34 +16,34 @@
libw2c_databinding_default_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
libw2c_c_namemaker_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
libw2c_c_qname2name_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
libw2c_default_qname2name_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
libw2c_c_code_indenter_ext_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/Makefile.am?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/Makefile.am Thu Sep 28 02:05:38 2006
@@ -5,14 +5,15 @@
libw2c_writer_if_la_LIBADD = \
$(top_builddir)/src/util/libw2c_util.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../../xml_schema/src/libaxis2_xml_schema.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include
prglib_LTLIBRARIES = \
libw2c_cservice_xml_writer.la \
Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Thu Sep 28 02:05:38 2006
@@ -89,52 +89,6 @@
AC_CHECK_LIB(cutest, CuTestInit, [], [TESTDIR=""])
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] use axiom.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axiom include dir in the path
- if test -d $withval; then
- axiominc="-I$withval"
- dnl else find the axiom include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axiom. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(To Use Xml Schema. This is a compulsory module to build Woden C)
AC_ARG_WITH(axis2_xml_schema,
[ --with-axis2_xml_schema[=PATH] use axis2_xml_schema.],
Modified: webservices/axis2/trunk/c/xml_schema/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/configure.ac?view=diff&rev=450766&r1=450765&r2=450766
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/configure.ac (original)
+++ webservices/axis2/trunk/c/xml_schema/configure.ac Thu Sep 28 02:05:38 2006
@@ -70,52 +70,6 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] use axiom.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axiom include dir in the path
- if test -d $withval; then
- axiominc="-I$withval"
- dnl else find the axiom include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axiom. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=yes],
[ case "${enableval}" in
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org