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 06:53:57 UTC
svn commit: r450693 [1/2] - in /webservices/axis2/trunk/c: ./ axiom/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/
axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/
axiom/src/util/ axiom/test/om/ axiom/test/soap/ axiom/test...
Author: pini
Date: Wed Sep 27 21:53:53 2006
New Revision: 450693
URL: http://svn.apache.org/viewvc?view=rev&rev=450693
Log:
Fix to jira 250
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/autogen.sh
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/axiom/src/attachments/Makefile.am
webservices/axis2/trunk/c/axiom/src/om/Makefile.am
webservices/axis2/trunk/c/axiom/src/parser/Makefile.am
webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am
webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
webservices/axis2/trunk/c/axiom/src/soap/Makefile.am
webservices/axis2/trunk/c/axiom/src/util/Makefile.am
webservices/axis2/trunk/c/axiom/test/om/Makefile.am
webservices/axis2/trunk/c/axiom/test/soap/Makefile.am
webservices/axis2/trunk/c/axiom/test/unit/Makefile.am
webservices/axis2/trunk/c/axiom/test/unit/om/Makefile.am
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/guththila/src/Makefile.am
webservices/axis2/trunk/c/modules/core/addr/Makefile.am
webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
webservices/axis2/trunk/c/modules/core/context/Makefile.am
webservices/axis2/trunk/c/modules/core/deployment/Makefile.am
webservices/axis2/trunk/c/modules/core/description/Makefile.am
webservices/axis2/trunk/c/modules/core/engine/Makefile.am
webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am
webservices/axis2/trunk/c/modules/core/receivers/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
webservices/axis2/trunk/c/modules/core/util/Makefile.am
webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
webservices/axis2/trunk/c/modules/wsdl/Makefile.am
webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am
webservices/axis2/trunk/c/rampart/Makefile.am
webservices/axis2/trunk/c/rampart/configure.ac
webservices/axis2/trunk/c/rampart/samples/callback/Makefile.am
webservices/axis2/trunk/c/rampart/src/core/Makefile.am
webservices/axis2/trunk/c/rampart/src/handlers/Makefile.am
webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/Makefile.am
webservices/axis2/trunk/c/rampart/src/util/Makefile.am
webservices/axis2/trunk/c/test/Makefile.am
webservices/axis2/trunk/c/test/core/addr/Makefile.am
webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
webservices/axis2/trunk/c/test/core/context/Makefile.am
webservices/axis2/trunk/c/test/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/core/description/Makefile.am
webservices/axis2/trunk/c/test/core/engine/Makefile.am
webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
webservices/axis2/trunk/c/test/unit/Makefile.am
webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
webservices/axis2/trunk/c/util/configure.ac
webservices/axis2/trunk/c/util/src/Makefile.am
webservices/axis2/trunk/c/util/src/minizip/Makefile.am
webservices/axis2/trunk/c/util/test/util/test_util.c
webservices/axis2/trunk/c/woden/Makefile.am
webservices/axis2/trunk/c/woden/configure.ac
webservices/axis2/trunk/c/woden/samples/Makefile.am
webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
webservices/axis2/trunk/c/woden/src/builder/Makefile.am
webservices/axis2/trunk/c/woden/src/builder/wsdl10/Makefile.am
webservices/axis2/trunk/c/woden/src/schema/Makefile.am
webservices/axis2/trunk/c/woden/src/types/Makefile.am
webservices/axis2/trunk/c/woden/src/util/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am
webservices/axis2/trunk/c/woden/src/xml/Makefile.am
webservices/axis2/trunk/c/woden/test/Makefile.am
webservices/axis2/trunk/c/xml_schema/Makefile.am
webservices/axis2/trunk/c/xml_schema/configure.ac
webservices/axis2/trunk/c/xml_schema/samples/Makefile.am
webservices/axis2/trunk/c/xml_schema/src/Makefile.am
webservices/axis2/trunk/c/xml_schema/test/Makefile.am
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,25 +1,26 @@
datadir=$(prefix)
logsdir=$(prefix)/logs
docsdir=$(prefix)/docs
-SUBDIRS = modules $(TESTDIR) include ides
+SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart $(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
logs_DATA=
docs_DATA=docs/*
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE samples/server/axis2.log samples build axis2c_build.sh
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE samples/server/axis2.log samples build axis2c_build.sh docs guththila
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
rm -rf `find $(distdir)/ -type d -name .deps`
rm -rf `find $(distdir)/ -type d -name .libs`
- sh dist.sh
- tar -chf - axis2c-src-${PACKAGE_VERSION} | gzip -c > axis2c-src-${PACKAGE_VERSION}.tar.gz
+ rm -rf `find $(distdir)/ -type f -name Makefile`
+# sh dist.sh
+# tar -chf - axis2c-src-${PACKAGE_VERSION} | gzip -c > axis2c-src-${PACKAGE_VERSION}.tar.gz
-bindist: $(bin_PROGRAMS)
- rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
- sh bindist.sh
- mkdir axis2c-bin-${PACKAGE_VERSION}-linux
- cp -r ${AXIS2C_HOME}/* axis2c-bin-${PACKAGE_VERSION}-linux
- tar -cf - axis2c-bin-${PACKAGE_VERSION}-linux | gzip -c > axis2c-bin-${PACKAGE_VERSION}-linux.tar.gz
- rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
+#bindist: $(bin_PROGRAMS)
+# rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
+# sh bindist.sh
+# mkdir axis2c-bin-${PACKAGE_VERSION}-linux
+# cp -r ${AXIS2C_HOME}/* axis2c-bin-${PACKAGE_VERSION}-linux
+# tar -cf - axis2c-bin-${PACKAGE_VERSION}-linux | gzip -c > axis2c-bin-${PACKAGE_VERSION}-linux.tar.gz
+# rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
Modified: webservices/axis2/trunk/c/autogen.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/autogen.sh?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/autogen.sh (original)
+++ webservices/axis2/trunk/c/autogen.sh Wed Sep 27 21:53:53 2006
@@ -1,4 +1,30 @@
#!/bin/bash
+echo 'Running autogen.sh in Util'
+cd util
+./autogen.sh
+
+echo 'Running autogen.sh in Axiom'
+cd ../axiom
+./autogen.sh
+
+echo 'Running autogen.sh in Xml_schema'
+cd ../xml_schema
+./autogen.sh
+
+echo 'Running autogen.sh in Woden'
+cd ../woden
+./autogen.sh
+
+echo 'Running autogen.sh in Guththila'
+cd ../guththila
+./autogen.sh
+
+echo 'Running autogen.sh in Rampart'
+cd ../rampart
+./autogen.sh
+
+echo 'Running autogen.sh in Axis2/C'
+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=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Wed Sep 27 21:53:53 2006
@@ -58,17 +58,16 @@
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- LIBXML2_DIR=""
+ PARSER_DIR=""
;;
*)
AC_MSG_RESULT(yes)
- LIBXML2_DIR="libxml2"
- GUTHTHILA_DIR=""
+ PARSER_DIR="libxml2"
;;
esac ],
AC_MSG_RESULT(yes)
- LIBXML2_DIR="libxml2"
+ PARSER_DIR="libxml2"
)
AC_MSG_CHECKING(whether to build guththila xml parser library)
@@ -76,21 +75,16 @@
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- GUTHTHILA_DIR=""
;;
*)
AC_MSG_RESULT(yes)
- GUTHTHILA_DIR="guththila"
- LIBXML2_DIR=""
+ PARSER_DIR="guththila"
;;
esac ],
AC_MSG_RESULT(no)
- GUTHTHILA_DIR=""
)
-
-
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.],
@@ -141,8 +135,7 @@
AC_SUBST(UTILINC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_DIR)
-AC_SUBST(GUTHTHILA_DIR)
+AC_SUBST(PARSER_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(TESTDIR)
Modified: webservices/axis2/trunk/c/axiom/src/attachments/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/Makefile.am Wed Sep 27 21:53:53 2006
@@ -5,10 +5,11 @@
mime_body_part.c \
mime_parser.c
-libaxis2_attachments_la_LIBADD = -laxis2_util
-INCLUDES = -I$(top_builddir)/include \
+libaxis2_attachments_la_LIBADD = ../../../util/src/libaxis2_util.la
+
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/parser \
- @UTILINC@
+ -I ../../../util/include
EXTRA_DIST = axiom_mime_body_part.h axiom_mime_output.h
Modified: webservices/axis2/trunk/c/axiom/src/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/om/Makefile.am Wed Sep 27 21:53:53 2006
@@ -16,17 +16,16 @@
om_children_with_specific_attribute_iterator.c \
om_navigator.c
-libaxis2_axiom_la_LIBADD = \
- $(top_builddir)/src/soap/libaxis2_soap.la \
- $(top_builddir)/src/attachments/libaxis2_attachments.la \
- $(top_builddir)/src/util/libaxis2_axiom_util.la \
- -laxis2_util
+libaxis2_axiom_la_LIBADD = $(top_builddir)/src/soap/libaxis2_soap.la \
+ $(top_builddir)/src/attachments/libaxis2_attachments.la \
+ $(top_builddir)/src/util/libaxis2_axiom_util.la \
+ ../../../util/src/.libs/libaxis2_util.la
-INCLUDES = -I$(top_builddir)/include \
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I$(top_builddir)/src/om \
-I$(top_builddir)/src/attachments \
- @UTILINC@
+ -I ../../../util/include
EXTRA_DIST = axiom_namespace_internal.h axiom_node_internal.h axiom_stax_builder_internal.h
Modified: webservices/axis2/trunk/c/axiom/src/parser/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1 +1,4 @@
-SUBDIRS = $(LIBXML2_DIR) $(GUTHTHILA_DIR)
+#SUBDIRS = $(LIBXML2_DIR) $(GUTHTHILA_DIR)
+SUBDIRS = $(PARSER_DIR)
+
+EXTRA_DIST=guththila
Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,16 +1,10 @@
-lib_LTLIBRARIES = libaxis2_guththila.la libaxis2_parser.la
-SUBDIRS =
-libaxis2_guththila_la_SOURCES = guththila_xml_writer_wrapper.c \
- guththila_xml_reader_wrapper.c
+lib_LTLIBRARIES = libaxis2_parser.la
-libaxis2_guththila_la_LIBADD = -lguththila
+libaxis2_parser_la_LIBADD = ../../../../guththila/src/libguththila.la
libaxis2_parser_la_SOURCES = guththila_xml_writer_wrapper.c \
guththila_xml_reader_wrapper.c
-libaxis2_parser_la_LIBADD = -lguththila
-
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- -I${GUTHTHILA_INCLUDES}
-
+ -I ../../../../util/include \
+ -I ../../../../guththila/include
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am Wed Sep 27 21:53:53 2006
@@ -11,4 +11,5 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
- @UTILINC@
+ -I ../../../../util/include
+
Modified: webservices/axis2/trunk/c/axiom/src/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/Makefile.am Wed Sep 27 21:53:53 2006
@@ -20,7 +20,7 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I$(top_builddir)/src/om \
- @UTILINC@
+ -I ../../../util/include
EXTRA_DIST = maven.xml project.xml axiom_soap11_builder_helper.h \
_axiom_soap_fault_code.h _axiom_soap_fault_reason.h \
Modified: webservices/axis2/trunk/c/axiom/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/util/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,10 +1,8 @@
noinst_LTLIBRARIES = libaxis2_axiom_util.la
-libaxis2_axiom_util_la_SOURCES = \
- om_util.c
+libaxis2_axiom_util_la_SOURCES = om_util.c
libaxis2_axiom_util_la_LIBADD =
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I$(top_builddir)/src/om \
- @UTILINC@
-
+ -I ../../../util/include
Modified: webservices/axis2/trunk/c/axiom/test/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/om/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,8 +6,7 @@
AM_CFLAGS = -g -O2 -pthread
test_om_SOURCES = test_om.c
-test_om_LDADD = \
- -laxis2_util \
+test_om_LDADD = ../../../util/src/libaxis2_util.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
$(top_builddir)/src/parser/libxml2/libaxis2_parser.la \
$(LIBXML2_LIBS) \
@@ -15,4 +14,4 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
- @UTILINC@
+ -I ../../../util/include
Modified: webservices/axis2/trunk/c/axiom/test/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,8 +6,7 @@
AM_CFLAGS = -g -O2 -pthread
test_soap_SOURCES = test_soap.c
-test_soap_LDADD = \
- -laxis2_util \
+test_soap_LDADD = ../../../util/src/libaxis2_util.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
$(top_builddir)/src/parser/libxml2/libaxis2_parser.la \
$(LIBXML2_LIBS) \
@@ -15,4 +14,4 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
- @UTILINC@
+ -I ../../../util/include
Modified: webservices/axis2/trunk/c/axiom/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/unit/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/unit/Makefile.am Wed Sep 27 21:53:53 2006
@@ -4,14 +4,13 @@
SUBDIRS = om
main_unit_test_suite_SOURCES = main.c
-main_unit_test_suite_LDADD = \
- -L$(CUTEST_HOME)/lib \
- -lcutest \
- -laxis2_util \
- -lxml2 \
- -L$(top_builddir)/test/unit/om -ltest_om \
- $(top_builddir)/src/om/libaxis2_axiom.la \
- $(top_builddir)/src/parser/libxml2/libaxis2_libxml2.la
+main_unit_test_suite_LDADD = -L$(CUTEST_HOME)/lib \
+ -lcutest \
+ ../../../util/src/libaxis2_util.la \
+ -lxml2 \
+ -L$(top_builddir)/test/unit/om -ltest_om \
+ $(top_builddir)/src/om/libaxis2_axiom.la \
+ $(top_builddir)/src/parser/libxml2/libaxis2_libxml2.la
INCLUDES = -I${CUTEST_HOME}/include \
Modified: webservices/axis2/trunk/c/axiom/test/unit/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/unit/om/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/unit/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/unit/om/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,7 +8,7 @@
INCLUDES = -I$(top_builddir)/include \
-I${CUTEST_HOME}/include \
-I$(top_builddir)/src/om \
- @UTILINC@
+ -I ../../../../util/include
check_PROGRAMS = om_test
prgbin_PROGRAMS = om_test
@@ -16,7 +16,7 @@
om_test_LDADD = libtest_om.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
+ ../../../../util/src/libaxis2_util.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
$(top_builddir)/src/parser/libxml2/libaxis2_parser.la \
$(LIBXML2_LIBS) \
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Sep 27 21:53:53 2006
@@ -17,10 +17,32 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
+
dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(z, inflate)
+if test -d $srcdir/util; then
+ AC_CONFIG_SUBDIRS(util)
+fi
+
+if test -d $srcdir/axiom; then
+ AC_CONFIG_SUBDIRS(axiom)
+fi
+
+if test -d $srcdir/xml_schema; then
+ AC_CONFIG_SUBDIRS(xml_schema)
+fi
+
+if test -d $srcdir/woden; then
+ AC_CONFIG_SUBDIRS(woden)
+fi
+
+if test -d $srcdir/rampart; then
+ AC_CONFIG_SUBDIRS(rampart)
+fi
+
+
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
@@ -68,6 +90,42 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+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"
+ if test -d $srcdir/guththila; then
+ AC_CONFIG_SUBDIRS(guththila)
+ fi
+
+ GUTHTHILA_DIR="guththila"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to use apache2 as server transport)
AC_ARG_WITH(apache2,
[ --with-apache2[=PATH] use apache2 as server transport.],
@@ -117,7 +175,7 @@
)
AC_MSG_CHECKING(whether to build tests)
-AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=no],
+AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=yes],
[ case "${enableval}" in
yes)
AC_MSG_RESULT(yes)
@@ -263,7 +321,11 @@
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
AC_SUBST(APACHE2BUILD)
+AC_SUBST(PARSER_DIR)
+AC_SUBST(GUTHTHILA_DIR)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
+export PARSER_DIR
+export prefix
AC_CONFIG_FILES([Makefile \
modules/Makefile \
Modified: webservices/axis2/trunk/c/guththila/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/guththila/src/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,8 +8,8 @@
guththila_unicode.c \
guththila_xml_writer.c
-libguththila_la_LIBADD = -laxis2_util
+libguththila_la_LIBADD = ../../util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@
+ -I ../../util/include
Modified: webservices/axis2/trunk/c/modules/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/addr/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libaxis2_addr.la
-libaxis2_addr_la_SOURCES = \
- relates_to.c \
+libaxis2_addr_la_SOURCES = relates_to.c \
svc_name.c \
any_content_type.c \
endpoint_ref.c \
@@ -10,5 +9,5 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,6 +1,5 @@
noinst_LTLIBRARIES = libaxis2_clientapi.la
-libaxis2_clientapi_la_SOURCES = \
- async_result.c \
+libaxis2_clientapi_la_SOURCES = async_result.c \
callback.c \
listener_manager.c \
callback_recv.c \
@@ -16,6 +15,6 @@
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/context/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libaxis2_context.la
-libaxis2_context_la_SOURCES = \
- ctx.c \
+libaxis2_context_la_SOURCES = ctx.c \
msg_ctx.c \
op_ctx.c \
svc_ctx.c \
@@ -11,6 +10,6 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/Makefile.am Wed Sep 27 21:53:53 2006
@@ -13,8 +13,7 @@
axis2_ws_info.h \
axis2_ws_info_list.h
-libaxis2_deployment_la_SOURCES = \
- phases_info.c \
+libaxis2_deployment_la_SOURCES =phases_info.c \
desc_builder.c \
arch_reader.c \
dep_engine.c \
@@ -35,6 +34,6 @@
-I$(top_builddir)/modules/core/phaseresolver \
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/core/util \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/axiom/include \
+ -I$(top_builddir)/util/include
Modified: webservices/axis2/trunk/c/modules/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libaxis2_description.la
-libaxis2_description_la_SOURCES = \
- desc.c \
+libaxis2_description_la_SOURCES =desc.c \
op.c \
svc.c \
module_desc.c \
@@ -19,8 +18,8 @@
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/woden/include \
- @AXIOMINC@ \
- @UTILINC@ \
- -I$(top_builddir)/xml_schema/include
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
EXTRA_DIST=axis2_client_utils.h
Modified: webservices/axis2/trunk/c/modules/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,21 +1,20 @@
-lib_LTLIBRARIES = libaxis2_engine.la
-noinst_HEADERS = \
- axis2_event.h
+lib_LTLIBRARIES=libaxis2_engine.la
+noinst_HEADERS=axis2_event.h
-libaxis2_engine_la_SOURCES = handler.c \
- conf.c \
- phase.c \
- disp_checker.c \
- event.c \
- addr_disp.c \
- req_uri_disp.c \
- disp.c \
- soap_action_disp.c \
- soap_body_disp.c \
- ctx_handler.c \
- engine.c
+libaxis2_engine_la_SOURCES=handler.c \
+ conf.c \
+ phase.c \
+ disp_checker.c \
+ event.c \
+ addr_disp.c \
+ req_uri_disp.c \
+ disp.c \
+ soap_action_disp.c \
+ soap_body_disp.c \
+ ctx_handler.c \
+ engine.c
-libaxis2_engine_la_LIBADD = $(top_builddir)/modules/core/description/libaxis2_description.la \
+libaxis2_engine_la_LIBADD=$(top_builddir)/modules/core/description/libaxis2_description.la \
$(top_builddir)/modules/core/receivers/libaxis2_receivers.la \
$(top_builddir)/modules/core/deployment/libaxis2_deployment.la \
$(top_builddir)/modules/core/context/libaxis2_context.la \
@@ -24,12 +23,11 @@
$(top_builddir)/modules/core/phaseresolver/libaxis2_phaseresolver.la \
$(top_builddir)/modules/core/util/libaxis2_core_utils.la \
$(top_builddir)/modules/core/transport/http/libaxis2_http.la \
- -laxis2_xml_schema \
- -laxis2_util \
- -laxis2_axiom \
- -lwoden
+ $(top_builddir)/xml_schema/src/libaxis2_xml_schema.la \
+ $(top_builddir)/util/src/libaxis2_util.la \
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la
-INCLUDES = -I$(top_builddir)/include \
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/description \
-I$(top_builddir)/modules/core/engine \
@@ -38,6 +36,6 @@
-I$(top_builddir)/modules/core/context \
-I$(top_builddir)/modules/core/util \
-I$(top_builddir)/modules/core/clientapi \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,12 +1,11 @@
noinst_LTLIBRARIES = libaxis2_phaseresolver.la
-libaxis2_phaseresolver_la_SOURCES = \
- phase_holder.c \
- phase_resolver.c
+libaxis2_phaseresolver_la_SOURCES = phase_holder.c \
+ phase_resolver.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/axiom/include \
+ -I$(top_builddir)/util/include
Modified: webservices/axis2/trunk/c/modules/core/receivers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libaxis2_receivers.la
-libaxis2_receivers_la_SOURCES = \
- msg_recv.c \
+libaxis2_receivers_la_SOURCES = msg_recv.c \
raw_xml_in_out_msg_recv.c \
svr_callback.c
@@ -9,6 +8,6 @@
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/util \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,20 +1,19 @@
SUBDIRS =
noinst_LTLIBRARIES = libaxis2_http.la
-libaxis2_http_la_SOURCES = \
- http_worker.c \
- http_transport_utils.c\
- http_simple_request.c\
- http_simple_response.c\
- http_request_line.c\
- http_status_line.c\
- http_header.c\
- http_out_transport_info.c\
- http_chunked_stream.c
+libaxis2_http_la_SOURCES = http_worker.c \
+ http_transport_utils.c\
+ http_simple_request.c\
+ http_simple_response.c\
+ http_request_line.c\
+ http_status_line.c\
+ http_header.c\
+ http_out_transport_info.c\
+ http_chunked_stream.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,5 +1,6 @@
lib_LTLIBRARIES = libaxis2_http_receiver.la
-libaxis2_http_receiver_la_LIBADD= -laxis2_util
+libaxis2_http_receiver_la_LIBADD= $(top_builddir)/util/src/libaxis2_util.la
+
libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
http_response_writer.c\
@@ -15,6 +16,6 @@
-I$(top_builddir)/modules/core/phaseresolver \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am Wed Sep 27 21:53:53 2006
@@ -5,8 +5,8 @@
http_client.c
libaxis2_http_sender_la_LIBADD = $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- -laxis2_axiom \
- -laxis2_util
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/util/src/libaxis2_util.la
if AXIS2_SSL_ENABLED
libaxis2_http_sender_la_SOURCES += ssl/ssl_stream.c\
@@ -24,6 +24,6 @@
-I$(top_builddir)/modules/core/phaseresolver \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am Wed Sep 27 21:53:53 2006
@@ -10,10 +10,10 @@
-L$(top_builddir)/modules/core/engine \
-L$(top_builddir)/modules/core/transport/http/sender \
-L$(top_builddir)/modules/core/transport/http/receiver \
- -laxis2_axiom \
+ -L$(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ -L$(top_builddir)/axiom/src/parser/libxml2/libaxis2_parser.la \
-laxis2_engine \
-lpthread \
- -laxis2_parser \
-laxis2_wsdl \
-laxis2_http_sender \
-laxis2_http_receiver \
@@ -29,9 +29,9 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/xml_schema/include\
+ -I$(top_builddir)/axiom/include\
+ -I$(top_builddir)/util/include\
@APACHE2INC@ \
- @APRINC@ \
- @AXIOMINC@ \
- @UTILINC@
+ @APRINC@
EXTRA_DIST=axis2_apache2_worker.h apache2_stream.h axis2_apache2_out_transport_info.h
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am Wed Sep 27 21:53:53 2006
@@ -9,16 +9,16 @@
-L$(top_builddir)/modules/core/engine \
-L$(top_builddir)/modules/core/transport/http/sender \
-L$(top_builddir)/modules/core/transport/http/receiver \
- -laxis2_util \
- -laxis2_axiom \
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/util/src/libaxis2_util.la \
+ ../../../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ $(top_builddir)/woden/src/wsdl20/libwoden.la \
+ $(top_builddir)/xml_schema/src/libaxis2_xml_schema.la \
-laxis2_engine \
-lpthread \
- -laxis2_parser \
-laxis2_wsdl \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lwoden \
- -laxis2_xml_schema \
$(LIBXML2_LIBS) \
$(GUTHTHILA_LIBS)
@@ -29,6 +29,6 @@
-I$(top_builddir)/modules/core/deployment\
-I$(top_builddir)/modules/core/phaseresolver \
-I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/core/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/util/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,12 +1,11 @@
noinst_LTLIBRARIES = libaxis2_core_utils.la
#noinst_HEADERS = axis2_core_utils.h
-libaxis2_core_utils_la_SOURCES = \
- core_utils.c
+libaxis2_core_utils_la_SOURCES = core_utils.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,10 +6,9 @@
addr_out_handler.c \
mod_addr.c
-libaxis2_mod_addr_la_LIBADD = \
- $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- -laxis2_axiom \
- -laxis2_util
+libaxis2_mod_addr_la_LIBADD = $(top_builddir)/modules/core/engine/libaxis2_engine.la \
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/core/description \
@@ -18,6 +17,6 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/wsdl \
- -I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include \
+ -I$(top_builddir)/axiom/include
Modified: webservices/axis2/trunk/c/modules/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/wsdl/Makefile.am Wed Sep 27 21:53:53 2006
@@ -28,11 +28,10 @@
wsdl_ext_soap_op.c
-libaxis2_wsdl_la_LIBADD = \
- -laxis2_axiom \
- -laxis2_util
+libaxis2_wsdl_la_LIBADD = $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include \
- -I$(top_builddir)/xml_schema/include\
- @UTILINC@
+ -I$(top_builddir)/xml_schema/include \
+ -I$(top_builddir)/util/include
Modified: webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,8 +1,7 @@
lib_LTLIBRARIES = libaxis2_wom.la
-libaxis2_wom_la_SOURCES = \
- wsdl11_mep_finder.c \
+libaxis2_wom_la_SOURCES = wsdl11_mep_finder.c \
wsdl_pump.c
INCLUDES = -I$(top_builddir)/include \
- -I$(top_builddir)/modules/wsdl/builder \
- @UTILINC@
+ -I$(top_builddir)/modules/wsdl/builder \
+ -I$(top_builddir)/util/include
Modified: webservices/axis2/trunk/c/rampart/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,4 +1,4 @@
-SUBDIRS = src samples
+SUBDIRS = src
include_HEADERS=$(top_builddir)/include/*.h
EXTRA_DIST = LICENSE build.sh autogen.sh
Modified: webservices/axis2/trunk/c/rampart/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/configure.ac?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/configure.ac (original)
+++ webservices/axis2/trunk/c/rampart/configure.ac Wed Sep 27 21:53:53 2006
@@ -85,8 +85,6 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(To Use Xml Schema. This is a compulsory module to build Woden C)
-
AXIOMINC=$axiominc
UTILINC=$axis2_utilinc
@@ -96,20 +94,12 @@
AC_CONFIG_FILES([Makefile \
src/Makefile \
- src/omxmlsec/Makefile\
- src/omxmlsec/openssl/Makefile\
+ src/omxmlsec/Makefile \
+ src/omxmlsec/openssl/Makefile \
src/data/Makefile \
src/handlers/Makefile \
- src/core/Makefile\
- src/util/Makefile\
- samples/Makefile \
- samples/callback/Makefile \
- samples/client/Makefile \
- samples/client/enc_echo/Makefile \
- samples/client/enc_echo/data/Makefile \
- samples/client/enc_echo/keys/Makefile \
- samples/client/echo/Makefile \
- samples/client/echo/data/Makefile
+ src/core/Makefile \
+ src/util/Makefile
])
AC_OUTPUT
Modified: webservices/axis2/trunk/c/rampart/samples/callback/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/callback/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/callback/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/samples/callback/Makefile.am Wed Sep 27 21:53:53 2006
@@ -3,5 +3,4 @@
libpwcb_la_SOURCES = pwcb.c
libpwcb_la_LIBADD =
INCLUDES = -I$(AXIS2C_HOME)/include \
- -I$(top_builddir)/include \
- @UTILINC@
+ -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/rampart/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/core/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/core/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/core/Makefile.am Wed Sep 27 21:53:53 2006
@@ -3,8 +3,7 @@
prglib_LTLIBRARIES = libmod_rampart.la
prglib_DATA= ../data/module.xml
-libmod_rampart_la_SOURCES = \
- mod_rampart.c
+libmod_rampart_la_SOURCES = mod_rampart.c
libmod_rampart_la_LIBADD = ../handlers/librampart_handlers.la \
../util/librampart_util.la \
@@ -12,4 +11,7 @@
../omxmlsec/openssl/libomopenssl.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@
+ -I ../../../include \
+ -I ../../../util/include \
+ -I ../../../axiom/include \
+ -I ../../../xml_schema/include
Modified: webservices/axis2/trunk/c/rampart/src/handlers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,8 +1,10 @@
TESTS =
noinst_LTLIBRARIES = librampart_handlers.la
-librampart_handlers_la_SOURCES = \
- rampart_out_handler.c\
- rampart_in_handler.c
+librampart_handlers_la_SOURCES = rampart_out_handler.c\
+ rampart_in_handler.c
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@
+ -I ../../../include \
+ -I ../../../util/include \
+ -I ../../../xml_schema/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am Wed Sep 27 21:53:53 2006
@@ -7,10 +7,11 @@
token_reference_list.c token_data_reference.c token_encrypted_key.c iv.c
libomxmlsec_la_LIBADD = -lssl\
- -laxis2_util \
- -lcrypto \
- -laxis2_axiom
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ -lcrypto
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../include \
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/Makefile.am Wed Sep 27 21:53:53 2006
@@ -2,10 +2,11 @@
libomopenssl_la_SOURCES = cipher_ctx.c crypt.c rsa.c pkey.c util.c cipher_property.c
libomopenssl_la_LIBADD = -lssl\
- -laxis2_util \
- -lcrypto \
- -laxis2_axiom
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ -lcrypto
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../util/include \
+ -I ../../../../include \
+ -I ../../../../axiom/include
Modified: webservices/axis2/trunk/c/rampart/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/util/Makefile.am Wed Sep 27 21:53:53 2006
@@ -4,9 +4,12 @@
librampart_util_la_SOURCES = rampart_action.c rampart_crypto_engine.c rampart_crypto_util.c rampart_util.c rampart_handler_util.c username_token.c timestamp_token.c
-librampart_util_la_LIBADD = -lssl\
- -lcrypto\
- -laxis2_util
+librampart_util_la_LIBADD = -lssl \
+ -lcrypto \
+ ../../../util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@
+ -I ../../../include \
+ -I ../../../util/include \
+ -I ../../../xml_schema/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,3 +1,5 @@
TESTS =
SUBDIRS = unit core tools itest
EXTRA_DIST=wsdl
+
+
Modified: webservices/axis2/trunk/c/test/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/addr/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Wed Sep 27 21:53:53 2006
@@ -7,11 +7,11 @@
test_addr_SOURCES = test_addr.c
test_addr_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
@@ -20,6 +20,6 @@
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/modules/xml/guththila \
-I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,12 +8,12 @@
test_clientapi_SOURCES = test_clientapi.c
test_clientapi_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
-lpthread \
- -lwoden \
- -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -21,12 +21,12 @@
$(GUTHTHILA_LIBS)
test_client_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
-lpthread \
- -lwoden \
- -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -43,6 +43,6 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Wed Sep 27 21:53:53 2006
@@ -7,16 +7,15 @@
test_context_SOURCES = test_context.c
-test_context_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
- $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- $(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+test_context_LDADD = ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
+ $(top_builddir)/modules/core/engine/libaxis2_engine.la \
+ $(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
+ $(GUTHTHILA_LIBS) \
+ $(LIBXML2_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/modules/xml/guththila/src \
@@ -24,6 +23,5 @@
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/description \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
-
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,11 +6,11 @@
test_deployment_SOURCES = test_deployment.c
test_deployment_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
@@ -26,6 +26,6 @@
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/modules/core/util \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
-
+ -I ../../../util/include \
+ -I ../../../axiom/include
+
Modified: webservices/axis2/trunk/c/test/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,12 +6,12 @@
test_description_SOURCES = test_description.c
test_description_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
-lpthread \
- -lwoden \
- -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
@@ -27,6 +27,6 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,11 +8,11 @@
test_engine_LDADD = \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
@@ -26,6 +26,6 @@
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include
Modified: webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,18 +8,19 @@
test_http_transport_LDADD = \
$(LDFLAGS) \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
- $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- $(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ $(top_builddir)/modules/core/engine/libaxis2_engine.la \
+ $(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
+ $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
+ $(LIBXML2_LIBS) \
+ $(GUTHTHILA_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
+
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Wed Sep 27 21:53:53 2006
@@ -3,11 +3,11 @@
round1_SOURCES = round1_client.c
round1_LDADD = $(LDFLAGS) \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -17,6 +17,6 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am Wed Sep 27 21:53:53 2006
@@ -3,11 +3,11 @@
round2_SOURCES = round2_client.c
round2_LDADD = $(LDFLAGS) \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -17,7 +17,6 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
-
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Wed Sep 27 21:53:53 2006
@@ -12,11 +12,11 @@
-L$(top_builddir)/test/unit/core/context -ltest_context \
-L$(top_builddir)/test/unit/core/phaseresolver -ltest_phaseresolver \
-L$(top_builddir)/test/unit/wsdl -ltest_wsdl \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../util/src/libaxis2_util.la \
+ ../../axiom/src/om/libaxis2_axiom.la \
+ ../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../woden/src/wsdl20/libwoden.la \
+ ../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -36,5 +36,5 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../util/include \
+ -I ../../axiom/include
Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,8 +8,8 @@
INCLUDES = -I$(top_builddir)/include \
-I${CUTEST_HOME}/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
prgbin_PROGRAMS = context_test
check_PROGRAMS = context_test
@@ -18,11 +18,11 @@
libtest_context.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am Wed Sep 27 21:53:53 2006
@@ -19,8 +19,8 @@
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/xml_schema/include \
-I${CUTEST_HOME}/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
prgbin_PROGRAMS = deployment_test
check_PROGRAMS = deployment_test
@@ -28,12 +28,12 @@
deployment_test_LDADD = libtest_deployment.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
-lpthread \
- -lwoden \
- -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Wed Sep 27 21:53:53 2006
@@ -21,8 +21,8 @@
-I$(top_builddir)/modules/core/clientapi \
-I${CUTEST_HOME}/include \
-I$(top_builddir)/xml_schema/include\
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
prgbin_PROGRAMS = description_test
check_PROGRAMS = description_test
@@ -30,11 +30,11 @@
description_test_LDADD = libtest_description.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Wed Sep 27 21:53:53 2006
@@ -15,8 +15,8 @@
-I$(top_builddir)/modules/wsdl \
-I${CUTEST_HOME}/include \
-I$(top_builddir)/xml_schema/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
check_PROGRAMS = engine_test
prgbin_PROGRAMS = engine_test
@@ -24,11 +24,11 @@
engine_test_LDADD = libtest_engine.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
- -lwoden \
- -laxis2_xml_schema \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Wed Sep 27 21:53:53 2006
@@ -18,8 +18,8 @@
-I$(top_builddir)/modules/core/clientapi \
-I$(top_builddir)/xml_schema/include \
-I${CUTEST_HOME}/include \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include
prgbin_PROGRAMS = phaseresolver_test
check_PROGRAMS = phaseresolver_test
@@ -27,11 +27,11 @@
phaseresolver_test_LDADD = libtest_phaseresolver.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../../woden/src/wsdl20/libwoden.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Wed Sep 27 21:53:53 2006
@@ -17,8 +17,8 @@
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/clientapi \
- @AXIOMINC@ \
- @UTILINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include
check_PROGRAMS = wsdl_test
@@ -29,11 +29,11 @@
-L$(CUTEST_HOME)/lib \
-lcutest \
$(top_builddir)/test/unit/wsdl/libtest_wsdl.la \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
- -lwoden \
- -laxis2_xml_schema \
+ ../../../util/src/libaxis2_util.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/util/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/configure.ac?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/util/configure.ac (original)
+++ webservices/axis2/trunk/c/util/configure.ac Wed Sep 27 21:53:53 2006
@@ -24,7 +24,7 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -Werror"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
LDFLAGS="-lpthread"
Modified: webservices/axis2/trunk/c/util/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/src/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
SUBDIRS = platforms/unix minizip
lib_LTLIBRARIES = libaxis2_util.la
-libaxis2_util_la_SOURCES = \
- hash.c \
+libaxis2_util_la_SOURCES = hash.c \
allocator.c \
env.c \
error.c \
@@ -34,9 +33,8 @@
base64_binary.c \
properties.c
-libaxis2_util_la_LIBADD = \
- $(top_builddir)/src/platforms/unix/libaxis2_unix.la \
- $(top_builddir)/src/minizip/libaxis2_minizip.la
+libaxis2_util_la_LIBADD = $(top_builddir)/src/platforms/unix/libaxis2_unix.la \
+ $(top_builddir)/src/minizip/libaxis2_minizip.la
INCLUDES = -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/util/src/minizip/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/src/minizip/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,14 +1,16 @@
lib_LTLIBRARIES = libaxis2_minizip.la
+libaxis2_minizip_la_SOURCES = ioapi.c \
+ unzip.c \
+ archive_extract.c \
+ crypt.c
-libaxis2_minizip_la_SOURCES = ioapi.c \
- unzip.c \
- archive_extract.c \
- crypt.c
-
-INCLUDES = -I$(top_builddir)/include \
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/platforms
-EXTRA_DIST= axis2_archive_extract.h axis2_crypt.h \
- axis2_ioapi.h axis2_iowin32.h axis2_unzip.h \
+EXTRA_DIST= axis2_archive_extract.h \
+ axis2_crypt.h \
+ axis2_ioapi.h \
+ axis2_iowin32.h \
+ axis2_unzip.h \
iowin32.c
Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Wed Sep 27 21:53:53 2006
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <axis2_hash.h>
#include <axis2_string.h>
-#include <axis2_file_diff.h>
#include <axis2_error_default.h>
#include <axis2_array_list.h>
#include <platforms/axis2_platform_auto_sense.h>
@@ -148,7 +147,6 @@
{
axis2_char_t *expected_file_name = AXIS2_STRDUP("expected", env);
axis2_char_t *actual_file_name = AXIS2_STRDUP("actual", env);
- axis2_file_diff(env, expected_file_name, actual_file_name);
return 0;
}
Modified: webservices/axis2/trunk/c/woden/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,6 +1,6 @@
-SUBDIRS = src $(TESTDIR) samples
+SUBDIRS = src $(TESTDIR)
include_HEADERS=$(top_builddir)/include/*.h
-EXTRA_DIST = build.sh autogen.sh LICENSE
+EXTRA_DIST = build.sh autogen.sh LICENSE samples
Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Wed Sep 27 21:53:53 2006
@@ -38,6 +38,38 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+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(whether to build tests)
AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=no],
[ case "${enableval}" in
@@ -135,6 +167,7 @@
AC_SUBST(UTILINC)
AC_SUBST(XMLSCHEMAINC)
AC_SUBST(TESTDIR)
+AC_SUBST(PARSER_DIR)
AC_CONFIG_FILES([Makefile \
src/Makefile \
@@ -153,8 +186,6 @@
src/wsdl10/extensions/soap/Makefile \
src/builder/Makefile \
src/builder/wsdl10/Makefile \
- samples/Makefile \
- samples/wsdl10/Makefile \
test/Makefile
])
Modified: webservices/axis2/trunk/c/woden/samples/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/Makefile.am Wed Sep 27 21:53:53 2006
@@ -2,19 +2,12 @@
prgbindir=$(prefix)/bin/samples/woden
prgbin_PROGRAMS = test_wsdl2
check_PROGRAMS = test_wsdl2
-test_wsdl2_SOURCES = \
- test_wsdl2.c
+test_wsdl2_SOURCES = test_wsdl2.c
-test_wsdl2_LDADD = \
- -laxis2_util \
+test_wsdl2_LDADD = -laxis2_util \
-laxis2_axiom \
-laxis2_xml_schema \
- -laxis2_parser \
- ../src/wsdl20/libwoden.la \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ -laxis2_parser \
+ -lwoden
-INCLUDES = -I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@ \
- @XMLSCHEMAINC@
+INCLUDES = -I$(AXIS2C_HOME)/include
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am Wed Sep 27 21:53:53 2006
@@ -4,16 +4,13 @@
test_wsdl1_SOURCES = \
test_wsdl1.c
-test_wsdl1_LDADD = \
- -laxis2_util \
+test_wsdl1_LDADD = -laxis2_util \
-laxis2_axiom \
-laxis2_xml_schema \
- -laxis2_parser \
- ../../src/wsdl20/libwoden.la \
+ -laxis2_parser \
+ -lwoden \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@ \
- @XMLSCHEMAINC@
+INCLUDES = -I$(AXIS2C_HOME)/include
+
Modified: webservices/axis2/trunk/c/woden/src/builder/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/builder/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,11 +1,10 @@
SUBDIRS = wsdl10
noinst_LTLIBRARIES = libwoden_builder.la
-libwoden_builder_la_SOURCES = \
- resolver.c \
+libwoden_builder_la_SOURCES = resolver.c \
reader.c
INCLUDES = -I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@ \
- @XMLSCHEMAINC@
+ -I ../../../util/include \
+ -I ../../../axiom/include \
+ -I ../../../xml_schema/include
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,9 +1,8 @@
noinst_LTLIBRARIES = libwoden_wsdl10_builder.la
-libwoden_wsdl10_builder_la_SOURCES = \
- wsdl10_reader.c
+libwoden_wsdl10_builder_la_SOURCES = wsdl10_reader.c
INCLUDES = -I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@ \
- @XMLSCHEMAINC@
+ -I ../../../../util/include \
+ -I ../../../../axiom/include \
+ -I ../../../../xml_schema/include
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org