You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/03/02 10:48:02 UTC

svn commit: r382335 - in /webservices/axis2/trunk/c: ./ modules/xml/parser/guththila/ modules/xml/parser/libxml2/ samples/client/addr_echo/ samples/client/echo/ samples/client/google/ samples/client/math/ test/core/addr/ test/core/clientapi/ test/core/...

Author: damitha
Date: Thu Mar  2 01:47:58 2006
New Revision: 382335

URL: http://svn.apache.org/viewcvs?rev=382335&view=rev
Log:
Now if user does not configure with a prefix a default prefix
is used to install to /usr/local/axis2c.

Modified:
    webservices/axis2/trunk/c/configure.ac
    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/util/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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Mar  2 01:47:58 2006
@@ -6,6 +6,8 @@
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+#AC_PREFIX_DEFAULT(/usr/local/axis2)
+AC_PREFIX_DEFAULT(/usr/local/axis2c)
 
 #AC_CONFIG_SRCDIR([modules/common/src/axis2.c])
 
@@ -71,6 +73,7 @@
     AC_MSG_RESULT(yes)
     LIBXML2="libxml2"
     LIBXML2_LIBNAME="-lxml2"
+    PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
 
     ;;
   esac ],

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -4,11 +4,10 @@
 libaxis2_guththila_la_SOURCES = guththila_xml_writer_wrapper.c \
                                 guththila_xml_reader_wrapper.c 
 
-libaxis2_guththila_la_LIBADD = 
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/xml/parser \
-            -I${GUTHTHILA_INCLUDE} \
-            -I$(top_builddir)/modules/platforms
+            -I$(top_builddir)/modules/platforms \
+            -I${GUTHTHILA_INCLUDE}
            

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -6,10 +6,8 @@
 libaxis2_parser_la_SOURCES = libxml2_reader_wrapper.c \
                               libxml2_writer_wrapper.c
 
-libaxis2_libxml2_la_LIBADD = 
-
 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$(LIBXML2_INCLUDE)

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -2,7 +2,7 @@
 prgbin_PROGRAMS = addr_echo
 addr_echo_SOURCES = echo_client.c
 
-addr_echo_LDADD   =  -L$(AXIS2C_HOME)/lib \
+addr_echo_LDADD   =  \
 					-laxis2_util \
                     -laxis2_om \
                     -laxis2_wsdl \
@@ -13,8 +13,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Thu Mar  2 01:47:58 2006
@@ -5,7 +5,6 @@
                 echo_client.c
 
 echo_LDADD   =  $(LDFLAGS) \
-                -L$(AXIS2C_HOME)/lib \
 				-laxis2_util \
                 -laxis2_om \
                 -laxis2_wsdl \
@@ -16,8 +15,8 @@
                 -laxis2_soap \
                 -laxis2_http_sender \
                 -laxis2_http_receiver \
-                -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                $(GUTHTHILA_LIBNAME) \
+                $(LIBXML2_LIBNAME)
 
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/google/Makefile.am Thu Mar  2 01:47:58 2006
@@ -3,7 +3,6 @@
 google_SOURCES = google_client.c
 
 google_LDADD   =    $(LDFLAGS) \
-                    -L$(AXIS2C_HOME)/lib \
 					-laxis2_util \
                     -laxis2_om \
                     -laxis2_wsdl \
@@ -13,8 +12,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/math/Makefile.am Thu Mar  2 01:47:58 2006
@@ -4,7 +4,7 @@
 math_SOURCES = axis2_math_stub.c \
                 math_client.c
 
-math_LDADD   =  -L$(AXIS2C_HOME)/lib \
+math_LDADD   =  \
 					-laxis2_util \
                     -laxis2_om \
                     -laxis2_wsdl \
@@ -15,8 +15,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Thu Mar  2 01:47:58 2006
@@ -5,7 +5,7 @@
 test_addr_SOURCES = test_addr.c
 
 
-test_addr_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_addr_LDADD   =  \
 	                -laxis2_util \
                     -laxis2_unix \
 	                -laxis2_om \
@@ -13,8 +13,8 @@
 	                -laxis2_engine \
 	                -laxis2_wsdl \
 	                -laxis2_parser \
-	                -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-	                -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+	                $(GUTHTHILA_LIBNAME) \
+	                $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Thu Mar  2 01:47:58 2006
@@ -7,7 +7,7 @@
 test_client_SOURCES = test_client.c
 test_clientapi_SOURCES = test_clientapi.c
 
-test_clientapi_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_clientapi_LDADD   =  \
 	                -laxis2_util \
 	                -laxis2_om \
 	                -laxis2_engine \
@@ -17,10 +17,10 @@
 	                -lpthread \
 					-laxis2_soap \
                     -laxis2_unix \
-	                -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-	                -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+	                $(LIBXML2_LIBNAME) \
+	                $(GUTHTHILA_LIBNAME)
 
-test_client_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_client_LDADD   =  \
 	                -laxis2_util \
 	                -laxis2_om \
 	                -laxis2_engine \
@@ -29,8 +29,8 @@
 	                -laxis2_parser \
 					-laxis2_soap \
                     -laxis2_unix \
-	                -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-	                -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) 
+	                $(LIBXML2_LIBNAME) \
+	                $(GUTHTHILA_LIBNAME) 
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Thu Mar  2 01:47:58 2006
@@ -5,7 +5,7 @@
 test_context_SOURCES = test_context.c
 
 
-test_context_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_context_LDADD   =   \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_om \
@@ -13,8 +13,8 @@
 			        -laxis2_engine \
 			        -laxis2_parser \
 			        -laxis2_wsdl \
-			        -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-			        -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+			        $(GUTHTHILA_LIBNAME) \
+			        $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Thu Mar  2 01:47:58 2006
@@ -5,7 +5,7 @@
 AM_CFLAGS = $(CFLAGS) -g -pthread
 test_deployment_SOURCES = test_deployment.c
 
-test_deployment_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_deployment_LDADD   =  \
 					-laxis2_util \
                     -laxis2_unix \
                     -laxis2_om \
@@ -13,8 +13,8 @@
                     -laxis2_engine \
                     -laxis2_soap \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
                     
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Thu Mar  2 01:47:58 2006
@@ -5,7 +5,7 @@
 AM_CFLAGS = -g -O2 -pthread
 test_description_SOURCES = test_description.c
 
-test_description_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_description_LDADD   =  \
 					-laxis2_util \
                     -laxis2_om \
                     -laxis2_unix \
@@ -14,8 +14,8 @@
                     -lpthread \
                     -laxis2_soap \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
                     
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Thu Mar  2 01:47:58 2006
@@ -7,7 +7,7 @@
 test_engine_SOURCES = test_engine.c
 
 
-test_engine_LDADD   =  -L$(AXIS2C_HOME)/lib \
+test_engine_LDADD   =   \
 	                -laxis2_util \
                     -laxis2_unix \
 	                -laxis2_om \
@@ -15,8 +15,8 @@
 	                -laxis2_engine \
 	                -laxis2_wsdl \
 	                -laxis2_parser \
-	                -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-	                -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+	                $(GUTHTHILA_LIBNAME) \
+	                $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -6,8 +6,8 @@
 AM_CFLAGS = -g -pthread
 test_http_transport_SOURCES = test_http_transport.c
 
-test_http_transport_LDADD   =  $(LDFLAGS) \
-								-L$(AXIS2C_HOME)/lib \
+test_http_transport_LDADD   =  \
+                                $(LDFLAGS) \
 								-laxis2_util \
 								-laxis2_om \
 								-laxis2_unix \
@@ -16,9 +16,10 @@
 								-laxis2_wsdl \
 								-laxis2_parser \
 								-laxis2_http_sender \
-								-L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-                    			-L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+								$(LIBXML2_LIBNAME) \
+                    			$(GUTHTHILA_LIBNAME)
                     
-INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
+INCLUDES = -I${CUTEST_HOME}/include \
+            -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util\
             -I$(top_builddir)/modules/platforms 

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -3,7 +3,6 @@
 round1_SOURCES = round1_client.c
 
 round1_LDADD   =    $(LDFLAGS) \
-                    -L$(AXIS2C_HOME)/lib \
 					-laxis2_util \
                     -laxis2_om \
                     -laxis2_wsdl \
@@ -13,8 +12,8 @@
                     -laxis2_soap \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Thu Mar  2 01:47:58 2006
@@ -14,7 +14,6 @@
                     -L$(top_builddir)/test/unit/util -ltest_util \
                     -L$(top_builddir)/test/unit/wsdl -ltest_wsdl \
                     -L$(top_builddir)/test/unit/xml/om -ltest_om \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_om \
@@ -23,8 +22,8 @@
                     -laxis2_soap \
                     -laxis2_wsdl \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
                     
 
 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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -13,17 +13,17 @@
 prgbin_PROGRAMS = context_test
 check_PROGRAMS = context_test
 context_test_SOURCES = main.c
-context_test_LDADD   =   libtest_context.la  \
-                     -L$(CUTEST_HOME)/lib \
-                     -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
-                    -laxis2_util \
-                    -laxis2_unix \
-                    -laxis2_engine \
-                    -laxis2_wsdl \
-                    -laxis2_om \
-                    -laxis2_soap \
-                    -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+context_test_LDADD   =   \
+                        libtest_context.la  \
+                        -L$(CUTEST_HOME)/lib \
+                        -lcutest \
+                        -laxis2_util \
+                        -laxis2_unix \
+                        -laxis2_engine \
+                        -laxis2_wsdl \
+                        -laxis2_om \
+                        -laxis2_soap \
+                        -laxis2_parser \
+                        $(GUTHTHILA_LIBNAME) \
+                        $(LIBXML2_LIBNAME)
 

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -29,7 +29,6 @@
 deployment_test_LDADD   =   libtest_deployment.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_engine \
@@ -38,6 +37,6 @@
                     -laxis2_om \
                     -lpthread \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -8,7 +8,8 @@
                                     test_flow.c \
                                     test_handler_desc.c
 
-noinst_HEADERS=$(top_builddir)/test/unit/core/description/*.h $(top_builddir)/test/unit/core/phaseresolver/*.h
+noinst_HEADERS=$(top_builddir)/test/unit/core/description/*.h \
+                $(top_builddir)/test/unit/core/phaseresolver/*.h
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \
@@ -29,7 +30,6 @@
 description_test_LDADD   =   libtest_description.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_engine \
@@ -37,6 +37,6 @@
                     -laxis2_om \
                     -laxis2_soap \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -24,7 +24,6 @@
 engine_test_LDADD   =   libtest_engine.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_engine \
@@ -32,5 +31,5 @@
                     -laxis2_om \
                     -laxis2_parser \
                     -laxis2_soap \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -27,7 +27,6 @@
 phaseresolver_test_LDADD   =   libtest_phaseresolver.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_engine \
@@ -35,6 +34,6 @@
                     -laxis2_om \
                     -laxis2_soap \
 					-laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 

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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.am Thu Mar  2 01:47:58 2006
@@ -36,7 +36,6 @@
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
                      $(top_builddir)/test/unit/util/libtest_util.la \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_unix \
                     -laxis2_engine \
@@ -45,6 +44,6 @@
                     -laxis2_om \
                     -lpthread \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)
 

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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Thu Mar  2 01:47:58 2006
@@ -29,7 +29,6 @@
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
                      $(top_builddir)/test/unit/wsdl/libtest_wsdl.la \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_wsdl \
 					-laxis2_unix \
@@ -37,5 +36,5 @@
                     -laxis2_om \
                     -laxis2_soap \
                     -laxis2_parser \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
+                    $(GUTHTHILA_LIBNAME) \
+                    $(LIBXML2_LIBNAME)

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=382335&r1=382334&r2=382335&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  2 01:47:58 2006
@@ -16,11 +16,10 @@
 om_test_LDADD   =   libtest_om.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_util \
                     -laxis2_om \
                     -laxis2_unix \
                     -laxis2_parser \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBNAME) \
+                    $(GUTHTHILA_LIBNAME)
                     

Modified: webservices/axis2/trunk/c/test/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/util/Makefile.am?rev=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/util/Makefile.am Thu Mar  2 01:47:58 2006
@@ -8,11 +8,13 @@
 test_util_SOURCES = test_util.c test_log.c
 test_thread_SOURCES = test_thread.c
 
-test_util_LDADD   =   -L$(AXIS2C_HOME)/lib -laxis2_util \
+test_util_LDADD   =   \
+                         -laxis2_util \
 						-laxis2_unix \
                         -lpthread
 
-test_thread_LDADD   =   -L$(AXIS2C_HOME)/lib -laxis2_util \
+test_thread_LDADD   =   \
+                        -laxis2_util \
 						-laxis2_unix\
                         -lpthread
 

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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/om/Makefile.am Thu Mar  2 01:47:58 2006
@@ -7,13 +7,12 @@
 test_om_SOURCES = test_om.c
 
 test_om_LDADD   =   \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_om \
                     -laxis2_util \
                     -laxis2_parser \
                     -laxis2_unix \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBNAME) \
+                    $(GUTHTHILA_LIBNAME)
                     
 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=382335&r1=382334&r2=382335&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/soap/Makefile.am Thu Mar  2 01:47:58 2006
@@ -7,15 +7,14 @@
 test_soap_SOURCES = test_soap.c
 
 test_soap_LDADD   =   \
-                    -L$(AXIS2C_HOME)/lib \
                     -laxis2_om \
                     -laxis2_soap \
                     -laxis2_util \
                     -laxis2_parser \
                     -laxis2_unix \
                     -laxis2_unix \
-                    -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-                    -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+                    $(LIBXML2_LIBNAME) \
+                    $(GUTHTHILA_LIBNAME)
                     
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/xml/parser \