axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r384458 - in /webservices/axis2/trunk/c: ./ modules/core/transport/http/server/simple_axis2_server/ modules/xml/parser/ modules/xml/parser/guththila/ modules/xml/parser/libxml2/ samples/client/addr_echo/ samples/client/echo/ samples/client/...
Date Thu, 09 Mar 2006 08:20:38 GMT
Author: damitha
Date: Thu Mar  9 00:20:34 2006
New Revision: 384458

URL: http://svn.apache.org/viewcvs?rev=384458&view=rev
Log:
Applied the patch sent by Sanjaya to avoid setting LIBXML2_INCLUDES env variable.
But the patch has the problem of build searching for libxml2 and guththila both
when trying to configure. If user does not want to enable guththila it still
try to find guththila. If guththila libs and includes are not in the system
configure process fails. Anyway I think since we are still using libxml2
I can proceed applying the patch. But We need to put a Jira to solve this
soon.


Modified:
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
    webservices/axis2/trunk/c/modules/xml/parser/Makefile.am
    webservices/axis2/trunk/c/modules/xml/parser/guththila/Makefile.am
    webservices/axis2/trunk/c/modules/xml/parser/libxml2/Makefile.am
    webservices/axis2/trunk/c/samples/client/addr_echo/Makefile.am
    webservices/axis2/trunk/c/samples/client/echo/Makefile.am
    webservices/axis2/trunk/c/samples/client/google/Makefile.am
    webservices/axis2/trunk/c/samples/client/math/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/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/util/Makefile.am
    webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
    webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
    webservices/axis2/trunk/c/test/xml/om/Makefile.am
    webservices/axis2/trunk/c/test/xml/soap/Makefile.am

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Mar  9 00:20:34 2006
@@ -26,7 +26,8 @@
 
 #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g3 -O2"
 CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE"
-#CFLAGS="$CFLAGS -Wall -ansi -Wshadow -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
-g -O2 -pthread"
+#CFLAGS="$CFLAGS -Wall -ansi -Wshadow -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE \
+#    -D_LARGEFILE64_SOURCE -g -O2 -pthread"
 LDFLAGS="-lpthread"
 
 dnl Checks for header files.
@@ -46,19 +47,16 @@
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
-    GUTHTHILA=""
-    GUTHTHILA_LIBNAME=""
+    GUTHTHILA_DIR=""
     ;;
   *)
     AC_MSG_RESULT(yes)
-    GUTHTHILA="guththila"
-    GUTHTHILA_LIBNAME="-lguththila"
+    GUTHTHILA_DIR="guththila"
 
     ;;
   esac ],
   AC_MSG_RESULT(no)
-  GUTHTHILA=""
-  GUTHTHILA_LIBNAME=""
+  GUTHTHILA_DIR=""
 )
 
 AC_MSG_CHECKING(whether to build libxml2 xml parser library)
@@ -66,20 +64,16 @@
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
-    LIBXML2=""
-    LIBXML2_LIBNAME=""
+    LIBXML2_DIR=""
     ;;
   *)
     AC_MSG_RESULT(yes)
-    LIBXML2="libxml2"
-    LIBXML2_LIBNAME="-lxml2"
-    PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+    LIBXML2_DIR="libxml2"
 
     ;;
   esac ],
   AC_MSG_RESULT(yes)
-  LIBXML2="libxml2"
-  LIBXML2_LIBNAME="-lxml2"
+  LIBXML2_DIR="libxml2"
 )
 
 AC_MSG_CHECKING(whether to build tests)
@@ -147,13 +141,14 @@
   CFLAGS="$CFLAGS"
 )
 
-PKG_CHECK_MODULES(XML2, libxml-2.0)
-AC_SUBST(XML2_CFLAGS)
-AC_SUBST(XML2_LIBS)
-AC_SUBST(LIBXML2)
-AC_SUBST(GUTHTHILA)
-AC_SUBST(LIBXML2_LIBNAME)
-AC_SUBST(GUTHTHILA_LIBNAME)
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
+
+AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LIBS)
+AC_SUBST(LIBXML2_DIR)
+AC_SUBST(GUTHTHILA_DIR)
+AC_SUBST(GUTHTHILA_LIBS)
 AC_SUBST(TESTDIR)
 AC_SUBST(SAMPLES)
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?rev=384458&r1=384457&r2=384458&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 Mar  9 00:20:34 2006
@@ -6,7 +6,6 @@
 axis2_http_server_SOURCES = http_server_main.c
 
 axis2_http_server_LDADD   =  $(LDFLAGS) \
-                            -L$(AXIS2C_HOME)/lib  \
                             -laxis2_om \
                             -laxis2_engine \
                             -laxis2_soap \
@@ -26,8 +25,8 @@
                             -L$(top_builddir)/modules/xml/parser/libxml2 \
                             -L$(top_builddir)/modules/xml/soap \
                             -L$(top_builddir)/modules/platforms/unix \
-                            -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-                            -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+                            $(LIBXML2_LIBS) \
+                            $(GUTHTHILA_LIBS)
                     
 INCLUDES =  -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util\

Modified: webservices/axis2/trunk/c/modules/xml/parser/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/Makefile.am Thu Mar  9 00:20:34 2006
@@ -1,2 +1,2 @@
 TESTS =
-SUBDIRS = $(LIBXML2) $(GUTHTHILA)
+SUBDIRS = $(LIBXML2_DIR) $(GUTHTHILA_DIR)

Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/Makefile.am Thu Mar  9 00:20:34
2006
@@ -9,5 +9,5 @@
             -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/xml/parser \
             -I$(top_builddir)/modules/platforms \
-            -I${GUTHTHILA_INCLUDE}
+            -I${GUTHTHILA_INCLUDES}
            

Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/Makefile.am Thu Mar  9 00:20:34 2006
@@ -9,5 +9,4 @@
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms \
-            -I$(LIBXML2_INCLUDE)
+            -I$(top_builddir)/modules/platforms

Modified: webservices/axis2/trunk/c/samples/client/addr_echo/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/client/addr_echo/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/addr_echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/addr_echo/Makefile.am Thu Mar  9 00:20:34 2006
@@ -13,8 +13,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/samples/client/echo/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/client/echo/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Thu Mar  9 00:20:34 2006
@@ -15,8 +15,8 @@
                 -laxis2_soap \
                 -laxis2_http_sender \
                 -laxis2_http_receiver \
-                $(GUTHTHILA_LIBNAME) \
-                $(LIBXML2_LIBNAME)
+                $(LIBXML2_LIBS) \
+                $(GUTHTHILA_LIBS)
 
 
 INCLUDES = -I$(top_builddir)/include \

Modified: webservices/axis2/trunk/c/samples/client/google/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/client/google/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/google/Makefile.am Thu Mar  9 00:20:34 2006
@@ -12,8 +12,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/samples/client/math/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/client/math/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/math/Makefile.am Thu Mar  9 00:20:34 2006
@@ -15,8 +15,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/test/core/addr/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/addr/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Thu Mar  9 00:20:34 2006
@@ -14,8 +14,8 @@
 	                -laxis2_engine \
 	                -laxis2_wsdl \
 	                -laxis2_parser \
-	                $(GUTHTHILA_LIBNAME) \
-	                $(LIBXML2_LIBNAME)
+	                $(GUTHTHILA_LIBS) \
+	                $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila \

Modified: webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/clientapi/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Thu Mar  9 00:20:34 2006
@@ -17,8 +17,8 @@
 	                -lpthread \
 					-laxis2_soap \
                     -laxis2_unix \
-	                $(LIBXML2_LIBNAME) \
-	                $(GUTHTHILA_LIBNAME)
+	                $(LIBXML2_LIBS) \
+	                $(GUTHTHILA_LIBS)
 
 test_client_LDADD   =  \
 	                -laxis2_util \
@@ -29,8 +29,8 @@
 	                -laxis2_parser \
 					-laxis2_soap \
                     -laxis2_unix \
-	                $(LIBXML2_LIBNAME) \
-	                $(GUTHTHILA_LIBNAME) 
+	                $(LIBXML2_LIBS) \
+	                $(GUTHTHILA_LIBS) 
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/include \

Modified: webservices/axis2/trunk/c/test/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/context/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Thu Mar  9 00:20:34 2006
@@ -14,8 +14,8 @@
 			        -laxis2_engine \
 			        -laxis2_parser \
 			        -laxis2_wsdl \
-			        $(GUTHTHILA_LIBNAME) \
-			        $(LIBXML2_LIBNAME)
+			        $(GUTHTHILA_LIBS) \
+			        $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila/src \

Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Thu Mar  9 00:20:34 2006
@@ -13,8 +13,8 @@
                     -laxis2_engine \
                     -laxis2_soap \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
                     
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/test/core/description/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/description/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Thu Mar  9 00:20:34 2006
@@ -14,8 +14,8 @@
                     -lpthread \
                     -laxis2_soap \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
                     
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/test/core/engine/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/engine/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Thu Mar  9 00:20:34 2006
@@ -15,8 +15,8 @@
 	                -laxis2_engine \
 	                -laxis2_wsdl \
 	                -laxis2_parser \
-	                $(GUTHTHILA_LIBNAME) \
-	                $(LIBXML2_LIBNAME)
+	                $(GUTHTHILA_LIBS) \
+	                $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila \

Modified: webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/transport/http/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Thu Mar  9 00:20:34 2006
@@ -16,8 +16,8 @@
 								-laxis2_wsdl \
 								-laxis2_parser \
 								-laxis2_http_sender \
-								$(LIBXML2_LIBNAME) \
-                    			$(GUTHTHILA_LIBNAME)
+								$(LIBXML2_LIBS) \
+                    			$(GUTHTHILA_LIBS)
                     
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/include \

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Thu Mar  9 00:20:34
2006
@@ -12,8 +12,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \

Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Thu Mar  9 00:20:34 2006
@@ -22,8 +22,8 @@
                     -laxis2_soap \
                     -laxis2_wsdl \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
                     
 
 INCLUDES = -I${CUTEST_HOME}/include \

Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Thu Mar  9 00:20:34 2006
@@ -24,6 +24,6 @@
                         -laxis2_om \
                         -laxis2_soap \
                         -laxis2_parser \
-                        $(GUTHTHILA_LIBNAME) \
-                        $(LIBXML2_LIBNAME)
+                        $(GUTHTHILA_LIBS) \
+                        $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am Thu Mar  9 00:20:34 2006
@@ -37,6 +37,6 @@
                     -laxis2_om \
                     -lpthread \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Thu Mar  9 00:20:34 2006
@@ -37,6 +37,6 @@
                     -laxis2_om \
                     -laxis2_soap \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Thu Mar  9 00:20:34 2006
@@ -31,5 +31,5 @@
                     -laxis2_om \
                     -laxis2_parser \
                     -laxis2_soap \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)

Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Thu Mar  9 00:20:34
2006
@@ -34,6 +34,6 @@
                     -laxis2_om \
                     -laxis2_soap \
 					-laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.am Thu Mar  9 00:20:34 2006
@@ -44,6 +44,6 @@
                     -laxis2_om \
                     -lpthread \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Thu Mar  9 00:20:34 2006
@@ -36,5 +36,5 @@
                     -laxis2_om \
                     -laxis2_soap \
                     -laxis2_parser \
-                    $(GUTHTHILA_LIBNAME) \
-                    $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBS) \
+                    $(LIBXML2_LIBS)

Modified: webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am Thu Mar  9 00:20:34 2006
@@ -20,6 +20,6 @@
                     -laxis2_om \
                     -laxis2_unix \
                     -laxis2_parser \
-                    $(LIBXML2_LIBNAME) \
-                    $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBS) \
+                    $(GUTHTHILA_LIBS)
                     

Modified: webservices/axis2/trunk/c/test/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/om/Makefile.am Thu Mar  9 00:20:34 2006
@@ -11,8 +11,8 @@
                     -laxis2_util \
                     -laxis2_parser \
                     -laxis2_unix \
-                    $(LIBXML2_LIBNAME) \
-                    $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBS) \
+                    $(GUTHTHILA_LIBS)
                     
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/xml/parser \

Modified: webservices/axis2/trunk/c/test/xml/soap/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/soap/Makefile.am?rev=384458&r1=384457&r2=384458&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/soap/Makefile.am Thu Mar  9 00:20:34 2006
@@ -13,8 +13,8 @@
                     -laxis2_parser \
                     -laxis2_unix \
                     -laxis2_unix \
-                    $(LIBXML2_LIBNAME) \
-                    $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBS) \
+                    $(GUTHTHILA_LIBS)
                     
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/xml/parser \



Mime
View raw message