axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r407512 - in /webservices/axis2/trunk/c: ./ axiom/ axiom/attachments/ axiom/om/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/p...
Date Thu, 18 May 2006 09:45:24 GMT
Author: damitha
Date: Thu May 18 02:45:22 2006
New Revision: 407512

URL: http://svn.apache.org/viewvc?rev=407512&view=rev
Log:
Changes due to folder structure change


Added:
    webservices/axis2/trunk/c/util/include/Makefile.am
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/Makefile.am
Removed:
    webservices/axis2/trunk/c/include/Makefile.am
Modified:
    webservices/axis2/trunk/c/axiom/attachments/Makefile.am
    webservices/axis2/trunk/c/axiom/build.sh
    webservices/axis2/trunk/c/axiom/configure.ac
    webservices/axis2/trunk/c/axiom/om/Makefile.am
    webservices/axis2/trunk/c/build.sh
    webservices/axis2/trunk/c/configure.ac
    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

Modified: webservices/axis2/trunk/c/axiom/attachments/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/attachments/Makefile.am?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/attachments/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/attachments/Makefile.am Thu May 18 02:45:22 2006
@@ -1,5 +1,5 @@
 TESTS =
-lib_LTLIBRARIES = libaxis2_attachments.la
+noinst_LTLIBRARIES = libaxis2_attachments.la
 AM_CPPFLAGS = $(CPPFLAGS)
 libaxis2_attachments_la_SOURCES = mime_output.c \
 					data_handler.c \

Modified: webservices/axis2/trunk/c/axiom/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/build.sh?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/build.sh (original)
+++ webservices/axis2/trunk/c/axiom/build.sh Thu May 18 02:45:22 2006
@@ -1,4 +1,4 @@
 #!/bin/bash
 ./autogen.sh
-./configure --enable-static=no --with-axis2_util=/home/damitha/projects/c/util/include
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2_util=/home/damitha/projects/c/util/include
 make

Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Thu May 18 02:45:22 2006
@@ -45,6 +45,40 @@
 AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
+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)
+    GUTHTHILA_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    GUTHTHILA_DIR="guththila"
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+  GUTHTHILA_DIR=""
+)
+
+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)
+    LIBXML2_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    LIBXML2_DIR="libxml2"
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  LIBXML2_DIR="libxml2"
+)
+
 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.],
@@ -68,10 +102,17 @@
   AC_MSG_RESULT(no)
 )
 
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
 
 UTILINC=$axis2_utilinc
 
 AC_SUBST(UTILINC)
+AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LIBS)
+AC_SUBST(LIBXML2_DIR)
+AC_SUBST(GUTHTHILA_DIR)
+AC_SUBST(GUTHTHILA_LIBS)
 
 AC_CONFIG_FILES([Makefile \
     parser/Makefile \

Modified: webservices/axis2/trunk/c/axiom/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/om/Makefile.am?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/om/Makefile.am Thu May 18 02:45:22 2006
@@ -17,7 +17,8 @@
                         om_children_with_specific_attribute_iterator.c \
                         om_navigator.c
 
-libaxis2_om_la_LIBADD =  ../../util/libaxis2_util.la ../attachments/libaxis2_attachments.la
+libaxis2_om_la_LIBADD = \
+					$(top_builddir)/attachments/libaxis2_attachments.la
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/parser \
             -I$(top_builddir)/om \

Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build.sh?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Thu May 18 02:45:22 2006
@@ -1,8 +1,9 @@
 #!/bin/bash
 ./autogen.sh
 AXIS2C_HOME=`pwd`/deploy
-export AXIS2C_HOME
-./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-trace=yes  --with-apache2=/usr/include/apache2
--with-apr=/usr/include/apr-0 --enable-diclient=no --enable-static=no --enable-openssl=no
+AXIS2C=`pwd`
+export AXIS2C_HOME AXIS2C
+./configure --prefix=${AXIS2C_HOME} --enable-tests=no --enable-trace=yes  --with-apache2=/usr/include/apache2
--with-apr=/usr/include/apr-0 --enable-diclient=no --enable-static=no --enable-openssl=no
--with-axis2_util=${AXIS2C}/util/include --with-axiom=${AXIS2C}/axiom/include
 make
 make install
 cd samples

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu May 18 02:45:22 2006
@@ -93,40 +93,6 @@
   AC_MSG_RESULT(no)
 )
 
-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)
-    GUTHTHILA_DIR=""
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    GUTHTHILA_DIR="guththila"
-
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-  GUTHTHILA_DIR=""
-)
-
-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)
-    LIBXML2_DIR=""
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    LIBXML2_DIR="libxml2"
-
-    ;;
-  esac ],
-  AC_MSG_RESULT(yes)
-  LIBXML2_DIR="libxml2"
-)
-
 AC_MSG_CHECKING(whether to build tests)
 AC_ARG_ENABLE(tests, [  --enable-tests    build tests. default=no],
 [ case "${enableval}" in
@@ -212,7 +178,7 @@
   DICLIENT_DIR="diclient"
 )
 
-AC_MSG_CHECKING(To Use Axis2 C OM. This is a compulsory module to build Axis2 C)
+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
@@ -258,8 +224,6 @@
   AC_MSG_RESULT(no)
 )
 
-PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
 
 APACHE2INC=$apache2inc
 AXIOMINC=$axiominc
@@ -270,12 +234,7 @@
 AC_SUBST(APRINC)
 AC_SUBST(AXIOMINC)
 AC_SUBST(UTILINC)
-AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_DIR)
 AC_SUBST(DICLIENT_DIR)
-AC_SUBST(GUTHTHILA_DIR)
-AC_SUBST(GUTHTHILA_LIBS)
 AC_SUBST(TESTDIR)
 AC_SUBST(SAMPLES)
 AC_SUBST(APACHE2BUILD)
@@ -338,7 +297,6 @@
     test/tools/Makefile \
     ides/Makefile \
     ides/anjuta/Makefile
-    include/Makefile \
     ])
     
 AC_OUTPUT

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/addr/Makefile.am Thu May 18 02:45:22 2006
@@ -10,8 +10,8 @@
                             msg_info_headers.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Thu May 18 02:45:22 2006
@@ -20,11 +20,11 @@
                     
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/deployment \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 EXTRA_DIST=diclient

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/context/Makefile.am Thu May 18 02:45:22 2006
@@ -10,8 +10,8 @@
                             conf_ctx.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/Makefile.am Thu May 18 02:45:22 2006
@@ -31,12 +31,12 @@
                                 conf_init.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/phaseresolver \
             -I$(top_builddir)/modules/core/deployment \
             -I$(top_builddir)/modules/core/util \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/Makefile.am Thu May 18 02:45:22 2006
@@ -15,8 +15,8 @@
                                 transport_out_desc.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/Makefile.am Thu May 18 02:45:22 2006
@@ -27,7 +27,6 @@
 					$(top_builddir)/modules/core/transport/http/libaxis2_http.la
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/engine \
@@ -36,5 +35,6 @@
             -I$(top_builddir)/modules/core/context \
             -I$(top_builddir)/modules/core/util \
             -I$(top_builddir)/modules/core/clientapi \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/Makefile.am Thu May 18 02:45:22 2006
@@ -6,8 +6,8 @@
                                 phase_resolver.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/Makefile.am Thu May 18 02:45:22 2006
@@ -6,9 +6,9 @@
                                 svr_callback.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/util \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am Thu May 18 02:45:22
2006
@@ -14,8 +14,8 @@
                                 http_chunked_stream.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am Thu May 18
02:45:22 2006
@@ -1,7 +1,6 @@
 TESTS =
 lib_LTLIBRARIES = libaxis2_http_receiver.la
-libaxis2_http_receiver_la_LIBADD= -L$(top_builddir)/modules/platforms/unix \
-                                    -laxis2_unix
+libaxis2_http_receiver_la_LIBADD= -laxis2_unix
 
 libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
 				                    http_response_writer.c\
@@ -9,8 +8,6 @@
                                     http_server.c
 
 INCLUDES = -I$(top_builddir)/include \
-           -I$(top_builddir)/modules/util \
-           -I$(top_builddir)/modules/xml/parser\
 	       -I$(top_builddir)/modules/wsdl\
 	       -I$(top_builddir)/modules/core/transport\
 	       -I$(top_builddir)/modules/core/transport/http \
@@ -19,4 +16,6 @@
            -I$(top_builddir)/modules/core/phaseresolver \
            -I$(top_builddir)/modules/core/engine \
            -I$(top_builddir)/modules/core/deployment \
-           -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am Thu May 18 02:45:22
2006
@@ -12,8 +12,6 @@
 endif
 
 INCLUDES = -I$(top_builddir)/include \
-           -I$(top_builddir)/modules/util \
-           -I$(top_builddir)/modules/xml/parser\
 	       -I$(top_builddir)/modules/wsdl\
 	       -I$(top_builddir)/modules/core/transport\
 	       -I$(top_builddir)/modules/core/transport/http \
@@ -22,4 +20,6 @@
            -I$(top_builddir)/modules/core/phaseresolver \
            -I$(top_builddir)/modules/core/engine \
            -I$(top_builddir)/modules/core/deployment \
-           -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- 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 Thu May
18 02:45:22 2006
@@ -6,15 +6,10 @@
                        apache2_worker.c
 AM_CFLAGS = -DAP_HAVE_DESIGNATED_INITIALIZER -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_SVID_SOURCE -D_GNU_SOURCE
 libmod_axis2_la_LIBADD   = $(LDFLAGS) \
-                    -L$(top_builddir)/modules/util \
                     -L$(top_builddir)/modules/wsdl \
                     -L$(top_builddir)/modules/core/engine \
                     -L$(top_builddir)/modules/core/transport/http/sender \
                     -L$(top_builddir)/modules/core/transport/http/receiver \
-                    -L$(top_builddir)/modules/xml/om \
-                    -L$(top_builddir)/modules/xml/parser/libxml2 \
-                    -L$(top_builddir)/modules/xml/soap \
-                    -L$(top_builddir)/modules/platforms/unix \
                     -laxis2_om \
                     -laxis2_engine \
                     -laxis2_soap \
@@ -29,8 +24,6 @@
 					$(GUTHTHILA_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
-           -I$(top_builddir)/modules/util \
-           -I$(top_builddir)/modules/xml/parser\
 	       -I$(top_builddir)/modules/wsdl\
 	       -I$(top_builddir)/modules/core/transport/http \
            -I$(top_builddir)/modules/core/description \
@@ -38,8 +31,10 @@
            -I$(top_builddir)/modules/core/phaseresolver \
            -I$(top_builddir)/modules/core/engine \
            -I$(top_builddir)/modules/core/deployment \
-           -I$(top_builddir)/modules/platforms\
             @APACHE2INC@ \
-            @APRINC@
+            @APRINC@ \
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- 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
Thu May 18 02:45:22 2006
@@ -6,15 +6,10 @@
 axis2_http_server_SOURCES = http_server_main.c
 
 axis2_http_server_LDADD   =  $(LDFLAGS) \
-                            -L$(top_builddir)/modules/util \
                             -L$(top_builddir)/modules/wsdl \
                             -L$(top_builddir)/modules/core/engine \
                             -L$(top_builddir)/modules/core/transport/http/sender \
                             -L$(top_builddir)/modules/core/transport/http/receiver \
-                            -L$(top_builddir)/modules/xml/om \
-                            -L$(top_builddir)/modules/xml/parser/libxml2 \
-                            -L$(top_builddir)/modules/xml/soap \
-                            -L$(top_builddir)/modules/platforms/unix \
                             -laxis2_util \
                             -laxis2_om \
                             -laxis2_engine \
@@ -30,14 +25,12 @@
                             $(GUTHTHILA_LIBS)
                     
 INCLUDES =  -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util\
             -I$(top_builddir)/modules/wsdl\
             -I$(top_builddir)/modules/core/description\
             -I$(top_builddir)/modules/core/context \
             -I$(top_builddir)/modules/core/deployment\
             -I$(top_builddir)/modules/core/phaseresolver \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/om\
-            -I$(top_builddir)/modules/xml/parser\
-            -I$(top_builddir)/modules/xml/soap\
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/util/Makefile.am Thu May 18 02:45:22 2006
@@ -6,8 +6,8 @@
                                	core_utils.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am Thu May 18 02:45:22 2006
@@ -7,17 +7,16 @@
                                 addr_out_handler.c \
                                 mod_addr.c
 
-libaxis2_mod_addr_la_LIBADD = $(top_builddir)/modules/util/libaxis2_util.la \
-                    $(top_builddir)/modules/xml/om/libaxis2_om.la \
+libaxis2_mod_addr_la_LIBADD =  \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/xml/parser \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/context \
             -I$(top_builddir)/modules/core/phaseresolver \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/deployment \
             -I$(top_builddir)/modules/wsdl \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

Modified: webservices/axis2/trunk/c/modules/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/Makefile.am?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/wsdl/Makefile.am Thu May 18 02:45:22 2006
@@ -29,6 +29,6 @@
                         wsdl_ext_soap_op.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407512&r1=407511&r2=407512&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/wsdl/builder/Makefile.am Thu May 18 02:45:22 2006
@@ -5,6 +5,6 @@
 							wsdl_pump.c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms \
-            -I$(top_builddir)/modules/wsdl/builder
+            -I$(top_builddir)/modules/wsdl/builder \
+			@UTILINC@ \
+			@UTILINC@/platforms



Mime
View raw message