axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r407754 - in /webservices/axis2/trunk/c/test: core/addr/ core/clientapi/ core/context/ core/deployment/ core/description/ core/engine/ core/transport/http/ itest/whitemesa/round1/ itest/whitemesa/round2/ unit/ unit/core/context/ unit/core/d...
Date Fri, 19 May 2006 09:22:51 GMT
Author: damitha
Date: Fri May 19 02:22:49 2006
New Revision: 407754

URL: http://svn.apache.org/viewvc?rev=407754&view=rev
Log:
Changes due to test moves

Modified:
    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/main.c
    webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
    webservices/axis2/trunk/c/test/wsdl/builder/print/Makefile.am

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Fri May 19 02:22:49 2006
@@ -7,19 +7,20 @@
 test_addr_SOURCES = test_addr.c
 
 test_addr_LDADD   =  \
-					$(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+					-laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 	                $(GUTHTHILA_LIBS) \
 	                $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila \
             -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Fri May 19 02:22:49 2006
@@ -8,34 +8,33 @@
 test_clientapi_SOURCES = test_clientapi.c
 
 test_clientapi_LDADD   =  \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+                    -laxis2_parser \
+	                -lpthread \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-                    $(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 					$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
-	                -lpthread \
 	                $(LIBXML2_LIBS) \
 	                $(GUTHTHILA_LIBS)
 
 test_client_LDADD   =  \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+                    -laxis2_parser \
+	                -lpthread \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-                    $(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 					$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
-	                -lpthread \
 	                $(LIBXML2_LIBS) \
 	                $(GUTHTHILA_LIBS) 
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -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 \
@@ -43,6 +42,7 @@
             -I$(top_builddir)/modules/core/deployment \
             -I$(top_builddir)/modules/core/engine \
             -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/test/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/Makefile.am?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Fri May 19 02:22:49 2006
@@ -8,21 +8,22 @@
 
 
 test_context_LDADD   =   \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 			        $(GUTHTHILA_LIBS) \
 			        $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila/src \
             -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/description \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Fri May 19 02:22:49 2006
@@ -6,18 +6,17 @@
 test_deployment_SOURCES = test_deployment.c
 
 test_deployment_LDADD   =  \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_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 \
@@ -26,7 +25,8 @@
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
             -I$(top_builddir)/modules/core/util \
-            -I$(top_builddir)/modules/platforms \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/include
+            -I$(top_builddir)/include \
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Fri May 19 02:22:49 2006
@@ -6,19 +6,18 @@
 test_description_SOURCES = test_description.c
 
 test_description_LDADD   =  \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+				    -laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
+                    -lpthread \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
-                    -lpthread \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_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 \
@@ -27,7 +26,8 @@
             -I$(top_builddir)/modules/core/transport \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
-            -I$(top_builddir)/modules/platforms \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/include
+            -I$(top_builddir)/include \
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Fri May 19 02:22:49 2006
@@ -8,24 +8,24 @@
 
 
 test_engine_LDADD   =   \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 	                $(GUTHTHILA_LIBS) \
 	                $(LIBXML2_LIBS)
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/xml/guththila \
             -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/deployment \
             -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/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/Makefile.am?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Fri May 19 02:22:49 2006
@@ -8,18 +8,19 @@
 
 test_http_transport_LDADD   =  \
                                 $(LDFLAGS) \
-								$(top_builddir)/modules/util/libaxis2_util.la \
-								$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-								$(top_builddir)/modules/xml/om/libaxis2_om.la \
-								$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+								-laxis2_util \
+								-laxis2_unix \
+								-laxis2_om \
+								-laxis2_soap \
+								-laxis2_parser \
 								$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 								$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-								$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.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 \
-            -I$(top_builddir)/modules/util\
-            -I$(top_builddir)/modules/platforms 
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Fri May 19 02:22:49
2006
@@ -3,21 +3,20 @@
 round1_SOURCES = round1_client.c
 
 round1_LDADD   =    $(LDFLAGS) \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 					$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
 					$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms \
-            -I$(top_builddir)/modules/xml/parser
-
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am Fri May 19 02:22:49
2006
@@ -3,21 +3,21 @@
 round2_SOURCES = round2_client.c
 
 round2_LDADD   =    $(LDFLAGS) \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 					$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
 					$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms \
-            -I$(top_builddir)/modules/xml/parser
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 

Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/Makefile.am?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Fri May 19 02:22:49 2006
@@ -11,16 +11,14 @@
                     -L$(top_builddir)/test/unit/core/engine -ltest_engine \
                     -L$(top_builddir)/test/unit/core/context -ltest_context \
                     -L$(top_builddir)/test/unit/core/phaseresolver -ltest_phaseresolver \
-                    -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 \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
 					$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
 					$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
                     $(GUTHTHILA_LIBS) \
@@ -29,7 +27,6 @@
 
 INCLUDES = -I${CUTEST_HOME}/include \
             -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 \
@@ -38,4 +35,6 @@
             -I$(top_builddir)/modules/core/transport \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Fri May 19 02:22:49 2006
@@ -7,8 +7,10 @@
 
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I${CUTEST_HOME}/include
+            -I${CUTEST_HOME}/include \
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 prgbin_PROGRAMS = context_test
 check_PROGRAMS = context_test
@@ -16,13 +18,13 @@
 context_test_LDADD   =   \
                         libtest_context.la  \
                         -L$(CUTEST_HOME)/lib \
-                   		$(top_builddir)/modules/util/libaxis2_util.la \
-				        $(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-						$(top_builddir)/modules/xml/om/libaxis2_om.la \
-						$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                   		-laxis2_util \
+				        -laxis2_unix \
+						-laxis2_om \
+						-laxis2_soap \
+						-laxis2_parser \
 						$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 						$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-						$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                         -lcutest \
                         $(GUTHTHILA_LIBS) \
                         $(LIBXML2_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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am Fri May 19 02:22:49 2006
@@ -10,8 +10,6 @@
 
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/context \
@@ -19,23 +17,25 @@
             -I$(top_builddir)/modules/core/deployment \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
-            -I$(top_builddir)/modules/xml/parser \
-            -I${CUTEST_HOME}/include
+            -I${CUTEST_HOME}/include \
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 prgbin_PROGRAMS = deployment_test
 check_PROGRAMS = deployment_test
 deployment_test_SOURCES = main.c
 deployment_test_LDADD   =   libtest_deployment.la  \
                     -L$(CUTEST_HOME)/lib \
-                   	$(top_builddir)/modules/util/libaxis2_util.la \
-				    $(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
-					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
-					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                      -lcutest \
+                   	-laxis2_util \
+				    -laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
                     -lpthread \
+					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
+					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Fri May 19 02:22:49 2006
@@ -12,7 +12,6 @@
                 $(top_builddir)/test/unit/core/phaseresolver/*.h
 
 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 \
@@ -21,20 +20,22 @@
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
             -I${CUTEST_HOME}/include \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 prgbin_PROGRAMS = description_test
 check_PROGRAMS = description_test
 description_test_SOURCES = main.c
 description_test_LDADD   =   libtest_description.la  \
                      -L$(CUTEST_HOME)/lib \
-                   	$(top_builddir)/modules/util/libaxis2_util.la \
-				    $(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                   	-laxis2_util \
+				    -laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                      -lcutest \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Fri May 19 02:22:49 2006
@@ -6,7 +6,6 @@
 noinst_HEADERS=$(top_builddir)/test/unit/core/engine/*.h
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/context \
             -I$(top_builddir)/modules/core/phaseresolver \
@@ -15,20 +14,22 @@
             -I$(top_builddir)/modules/core/clientapi \
             -I$(top_builddir)/modules/wsdl \
             -I${CUTEST_HOME}/include \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 check_PROGRAMS = engine_test
 prgbin_PROGRAMS = engine_test
 engine_test_SOURCES = main.c
 engine_test_LDADD   =   libtest_engine.la  \
                      -L$(CUTEST_HOME)/lib \
-                   	$(top_builddir)/modules/util/libaxis2_util.la \
-				    $(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                   	-laxis2_util \
+				    -laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                      -lcutest \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Fri May 19 02:22:49
2006
@@ -9,7 +9,6 @@
 noinst_HEADERS=$(top_builddir)/test/unit/core/phaseresolver/*.h
 
 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 \
@@ -18,7 +17,9 @@
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
             -I${CUTEST_HOME}/include \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 prgbin_PROGRAMS = phaseresolver_test
 check_PROGRAMS = phaseresolver_test
@@ -26,13 +27,13 @@
 phaseresolver_test_LDADD   =   libtest_phaseresolver.la  \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                  	$(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                  	-laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/test/unit/main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/main.c?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/main.c (original)
+++ webservices/axis2/trunk/c/test/unit/main.c Fri May 19 02:22:49 2006
@@ -1,6 +1,4 @@
 #include <CuTest.h>
-#include "util/util_test.h"
-#include "xml/om/om_test.h"
 #include "core/phaseresolver/phaseresolver_test.h"
 #include "core/description/description_test.h"
 #include "core/engine/engine_test.h"
@@ -10,9 +8,7 @@
     CuString *output = CuStringNew();
     CuSuite* suite = CuSuiteNew();
 
-    CuSuiteAddSuite(suite, axis2_utilGetSuite());
     CuSuiteAddSuite(suite, axis2_wsdlGetSuite());
-    CuSuiteAddSuite(suite, axis2_omGetSuite());
     CuSuiteAddSuite(suite, axis2_engineGetSuite());
     
     CuSuiteAddSuite(suite, axis2_phaseresolverGetSuite());

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?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Fri May 19 02:22:49 2006
@@ -9,7 +9,6 @@
 
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
-            -I$(top_builddir)/modules/util \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/description \
             -I$(top_builddir)/modules/core/context \
@@ -17,7 +16,9 @@
             -I$(top_builddir)/modules/core/deployment \
             -I$(top_builddir)/modules/core/engine \
             -I$(top_builddir)/modules/core/clientapi \
-            -I$(top_builddir)/modules/platforms
+			@AXIOMINC@ \
+			@UTILINC@ \
+			@UTILINC@/platforms
 
 
 check_PROGRAMS = wsdl_test
@@ -28,12 +29,12 @@
                     -L$(CUTEST_HOME)/lib \
                     -lcutest \
                     $(top_builddir)/test/unit/wsdl/libtest_wsdl.la \
-                    $(top_builddir)/modules/util/libaxis2_util.la \
-					$(top_builddir)/modules/platforms/unix/libaxis2_unix.la \
-					$(top_builddir)/modules/xml/om/libaxis2_om.la \
-					$(top_builddir)/modules/xml/soap/libaxis2_soap.la \
+                    -laxis2_util \
+					-laxis2_unix \
+					-laxis2_om \
+					-laxis2_soap \
+					-laxis2_parser \
 					$(top_builddir)/modules/core/engine/libaxis2_engine.la \
 					$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
-					$(top_builddir)/modules/xml/parser/libxml2/libaxis2_parser.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)

Modified: webservices/axis2/trunk/c/test/wsdl/builder/print/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/wsdl/builder/print/Makefile.am?rev=407754&r1=407753&r2=407754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/wsdl/builder/print/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/wsdl/builder/print/Makefile.am Fri May 19 02:22:49 2006
@@ -16,5 +16,6 @@
                     -laxis2_wsdl4c
 
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util
+			@UTILINC@ \
+			@UTILINC@/platforms
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message