axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r351633 - in /webservices/axis2/trunk/c/modules/test: common/ core/handlers/ om/ unit/ unit/core/context/ unit/core/description/ unit/core/engine/ unit/core/phaseresolver/ unit/util/ unit/xml/om/ util/
Date Fri, 02 Dec 2005 08:23:20 GMT
Author: damitha
Date: Fri Dec  2 00:22:50 2005
New Revision: 351633

URL: http://svn.apache.org/viewcvs?rev=351633&view=rev
Log: (empty)

Removed:
    webservices/axis2/trunk/c/modules/test/om/
Modified:
    webservices/axis2/trunk/c/modules/test/common/Makefile.am
    webservices/axis2/trunk/c/modules/test/common/Makefile.in
    webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.am
    webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/core/phaseresolver/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/util/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/util/Makefile.in
    webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.am
    webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.in
    webservices/axis2/trunk/c/modules/test/util/Makefile.am
    webservices/axis2/trunk/c/modules/test/util/Makefile.in

Modified: webservices/axis2/trunk/c/modules/test/common/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/common/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.am Fri Dec  2 00:22:50 2005
@@ -4,5 +4,5 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 test_common_SOURCES = test_common.c
 
-test_common_LDADD   =  $(LDFLAGS) ../../common/src/libaxis2_common.la
+test_common_LDADD   =  $(LDFLAGS) -L$(top_builddir)/lib -laxis2_common
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include

Modified: webservices/axis2/trunk/c/modules/test/common/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/common/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.in Fri Dec  2 00:22:50 2005
@@ -58,8 +58,7 @@
 am_test_common_OBJECTS = test_common.$(OBJEXT)
 test_common_OBJECTS = $(am_test_common_OBJECTS)
 am__DEPENDENCIES_1 =
-test_common_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../../common/src/libaxis2_common.la
+test_common_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
 am__depfiles_maybe = depfiles
@@ -194,7 +193,7 @@
 SUBDIRS = 
 AM_CPPFLAGS = $(CPPFLAGS)
 test_common_SOURCES = test_common.c
-test_common_LDADD = $(LDFLAGS) ../../common/src/libaxis2_common.la
+test_common_LDADD = $(LDFLAGS) -L$(top_builddir)/lib -laxis2_common
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
 all: all-recursive
 

Modified: webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.am Fri Dec  2 00:22:50 2005
@@ -4,7 +4,7 @@
 AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
 test_handler_SOURCES = test_handler.c
 
-test_handler_LDADD   =  $(LDFLAGS) -L$(top_builddir)/modules/util/src/.libs -laxis2_util
+test_handler_LDADD   =  $(LDFLAGS) -L$(top_builddir)/lib -laxis2_util
                     
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/core/handlers/Makefile.in Fri Dec  2 00:22:50 2005
@@ -193,7 +193,7 @@
 SUBDIRS = 
 AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
 test_handler_SOURCES = test_handler.c
-test_handler_LDADD = $(LDFLAGS) -L$(top_builddir)/modules/util/src/.libs -laxis2_util
+test_handler_LDADD = $(LDFLAGS) -L$(top_builddir)/lib -laxis2_util
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src
 

Modified: webservices/axis2/trunk/c/modules/test/unit/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.am Fri Dec  2 00:22:50 2005
@@ -5,11 +5,14 @@
 main_unit_test_suite_SOURCES = main.c
 
 main_unit_test_suite_LDADD   =  $(LDFLAGS) \
-                    -L$(top_builddir)/modules/common/test/.libs -ltest_common \
-                    -L$(top_builddir)/modules/util/test/.libs -ltest_util \
-                    -L$(top_builddir)/modules/xml/om/test/.libs -ltest_om \
-                    -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila
\
-                    -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila
+                    -L$(top_builddir)/modules/test/test/unit/core/description/.libs -ltest_description
\
+                    -L$(top_builddir)/modules/test/test/unit/core/engine/.libs -ltest_engine
\
+                    -L$(top_builddir)/modules/test/test/unit/core/context/.libs -ltest_context
\
+                    -L$(top_builddir)/modules/test/test/unit/core/phaseresolver/.libs -ltest_phaseresolver
\
+                    -L$(top_builddir)/modules/test/unit/util/.libs -ltest_util \
+                    -L$(top_builddir)/modules/test/unit/xml/om/.libs -ltest_om \
+                    -L$(top_builddir)/modules/lib -laxis2_guththila \
+                    -L$(top_builddir)/modules/lib -lguththila
 
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/modules/test/unit/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.in Fri Dec  2 00:22:50 2005
@@ -190,15 +190,18 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 prgbindir = $(prefix)/bin/unit_test
-SUBDIRS = 
+SUBDIRS = util core xml
 AM_CPPFLAGS = $(CPPFLAGS)
 main_unit_test_suite_SOURCES = main.c
 main_unit_test_suite_LDADD = $(LDFLAGS) \
-                    -L$(top_builddir)/modules/common/test/.libs -ltest_common \
-                    -L$(top_builddir)/modules/util/test/.libs -ltest_util \
-                    -L$(top_builddir)/modules/xml/om/test/.libs -ltest_om \
-                    -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila
\
-                    -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila
+                    -L$(top_builddir)/modules/test/test/unit/core/description/.libs -ltest_description
\
+                    -L$(top_builddir)/modules/test/test/unit/core/engine/.libs -ltest_engine
\
+                    -L$(top_builddir)/modules/test/test/unit/core/context/.libs -ltest_context
\
+                    -L$(top_builddir)/modules/test/test/unit/core/phaseresolver/.libs -ltest_phaseresolver
\
+                    -L$(top_builddir)/modules/test/unit/util/.libs -ltest_util \
+                    -L$(top_builddir)/modules/test/unit/xml/om/.libs -ltest_om \
+                    -L$(top_builddir)/modules/lib -laxis2_guththila \
+                    -L$(top_builddir)/modules/lib -lguththila
 
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.am Fri Dec  2 00:22:50
2005
@@ -5,8 +5,7 @@
 libtest_context_la_SOURCES = context_test.c
 include_HEADERS=$(top_builddir)/modules/core/context/test/*.h
 
-libtest_context_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/context/src/.libs \
-                                -laxis2_context
+
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
@@ -14,8 +13,13 @@
 prgbin_PROGRAMS = context_test
 context_test_SOURCES = main.c
 context_test_LDADD   =  $(LDFLAGS) libtest_context.la  \
-                    -L$(top_builddir)/modules/core/context/src/.libs -laxis2_context \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 

Modified: webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/context/Makefile.in Fri Dec  2 00:22:50
2005
@@ -24,7 +24,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,7 +42,7 @@
 host_triplet = @host@
 target_triplet = @target@
 prgbin_PROGRAMS = context_test$(EXEEXT)
-subdir = modules/core/context/test
+subdir = modules/test/unit/core/context
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,14 +65,14 @@
 	"$(DESTDIR)$(includedir)"
 prglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(prglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtest_context_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libtest_context_la_LIBADD =
 am_libtest_context_la_OBJECTS = context_test.lo
 libtest_context_la_OBJECTS = $(am_libtest_context_la_OBJECTS)
 prgbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(prgbin_PROGRAMS)
 am_context_test_OBJECTS = main.$(OBJEXT)
 context_test_OBJECTS = $(am_context_test_OBJECTS)
+am__DEPENDENCIES_1 =
 context_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_context.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -205,19 +205,21 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_context_la_SOURCES = context_test.c
 include_HEADERS = $(top_builddir)/modules/core/context/test/*.h
-libtest_context_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/context/src/.libs \
-                                -laxis2_context
-
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 context_test_SOURCES = main.c
 context_test_LDADD = $(LDFLAGS) libtest_context.la  \
-                    -L$(top_builddir)/modules/core/context/src/.libs -laxis2_context \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 
 all: all-am
 
@@ -232,9 +234,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/core/context/test/Makefile';
\
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/test/unit/core/context/Makefile';
\
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/core/context/test/Makefile
+	  $(AUTOMAKE) --gnu  modules/test/unit/core/context/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.am Fri Dec  2 00:22:50
2005
@@ -5,11 +5,6 @@
 libtest_description_la_SOURCES = description_test.c
 include_HEADERS=$(top_builddir)/modules/core/description/test/*.h
 
-libtest_description_la_LIBADD = $(LDFLAGS) \
-                        -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
\
-                        -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                        -L$(top_builddir)/modules/core/context/src/.libs -laxis2_context
\
-                        -L$(top_builddir)/modules/core/phaseresolver/src/.libs -laxis2_phaseresolver
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
@@ -18,9 +13,13 @@
 prgbin_PROGRAMS = description_test
 description_test_SOURCES = main.c
 description_test_LDADD   =  $(LDFLAGS) libtest_description.la  \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
\
-                    -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/phaseresolver/src/.libs -laxis2_phaseresolver
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 

Modified: webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/description/Makefile.in Fri Dec  2 00:22:50
2005
@@ -24,7 +24,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,7 +42,7 @@
 host_triplet = @host@
 target_triplet = @target@
 prgbin_PROGRAMS = description_test$(EXEEXT)
-subdir = modules/core/description/test
+subdir = modules/test/unit/core/description
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,14 +65,14 @@
 	"$(DESTDIR)$(includedir)"
 prglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(prglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtest_description_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libtest_description_la_LIBADD =
 am_libtest_description_la_OBJECTS = description_test.lo
 libtest_description_la_OBJECTS = $(am_libtest_description_la_OBJECTS)
 prgbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(prgbin_PROGRAMS)
 am_description_test_OBJECTS = main.$(OBJEXT)
 description_test_OBJECTS = $(am_description_test_OBJECTS)
+am__DEPENDENCIES_1 =
 description_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	libtest_description.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -208,23 +208,21 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_description_la_SOURCES = description_test.c
 include_HEADERS = $(top_builddir)/modules/core/description/test/*.h
-libtest_description_la_LIBADD = $(LDFLAGS) \
-                        -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
\
-                        -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                        -L$(top_builddir)/modules/core/context/src/.libs -laxis2_context
\
-                        -L$(top_builddir)/modules/core/phaseresolver/src/.libs -laxis2_phaseresolver
-
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 description_test_SOURCES = main.c
 description_test_LDADD = $(LDFLAGS) libtest_description.la  \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
\
-                    -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/phaseresolver/src/.libs -laxis2_phaseresolver
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 
 all: all-am
 
@@ -239,9 +237,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/core/description/test/Makefile';
\
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/test/unit/core/description/Makefile';
\
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/core/description/test/Makefile
+	  $(AUTOMAKE) --gnu  modules/test/unit/core/description/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.am Fri Dec  2 00:22:50
2005
@@ -5,8 +5,6 @@
 libtest_engine_la_SOURCES = engine_test.c
 include_HEADERS=$(top_builddir)/modules/core/engine/test/*.h
 
-libtest_engine_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/engine/src/.libs \
-                                -laxis2_engine
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
@@ -14,8 +12,12 @@
 prgbin_PROGRAMS = engine_test
 engine_test_SOURCES = main.c
 engine_test_LDADD   =  $(LDFLAGS) libtest_engine.la  \
-                    -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
-
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila

Modified: webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/engine/Makefile.in Fri Dec  2 00:22:50
2005
@@ -24,7 +24,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,7 +42,7 @@
 host_triplet = @host@
 target_triplet = @target@
 prgbin_PROGRAMS = engine_test$(EXEEXT)
-subdir = modules/core/engine/test
+subdir = modules/test/unit/core/engine
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,14 +65,14 @@
 	"$(DESTDIR)$(includedir)"
 prglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(prglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtest_engine_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libtest_engine_la_LIBADD =
 am_libtest_engine_la_OBJECTS = engine_test.lo
 libtest_engine_la_OBJECTS = $(am_libtest_engine_la_OBJECTS)
 prgbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(prgbin_PROGRAMS)
 am_engine_test_OBJECTS = main.$(OBJEXT)
 engine_test_OBJECTS = $(am_engine_test_OBJECTS)
+am__DEPENDENCIES_1 =
 engine_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_engine.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -205,19 +205,21 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_engine_la_SOURCES = engine_test.c
 include_HEADERS = $(top_builddir)/modules/core/engine/test/*.h
-libtest_engine_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/engine/src/.libs \
-                                -laxis2_engine
-
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
 
 engine_test_SOURCES = main.c
 engine_test_LDADD = $(LDFLAGS) libtest_engine.la  \
-                    -L$(top_builddir)/modules/core/engine/src/.libs -laxis2_engine \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl \
-                    -L$(top_builddir)/modules/core/description/src/.libs -laxis2_description
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 
 all: all-am
 
@@ -232,9 +234,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/core/engine/test/Makefile';
\
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/test/unit/core/engine/Makefile';
\
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/core/engine/test/Makefile
+	  $(AUTOMAKE) --gnu  modules/test/unit/core/engine/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: webservices/axis2/trunk/c/modules/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/core/phaseresolver/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/core/phaseresolver/Makefile.am Fri Dec  2
00:22:50 2005
@@ -5,8 +5,6 @@
 libtest_phaseresolver_la_SOURCES = phaseresolver_test.c
 include_HEADERS=$(top_builddir)/modules/core/phaseresolver/test/*.h
 
-libtest_phaseresolver_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/phaseresolver/src/.libs
\
-                                -laxis2_phaseresolver
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src \
             -I${CUTEST_HOME}/include
@@ -14,7 +12,13 @@
 prgbin_PROGRAMS = phaseresolver_test
 phaseresolver_test_SOURCES = main.c
 phaseresolver_test_LDADD   =  $(LDFLAGS) libtest_phaseresolver.la  \
-                    -L$(top_builddir)/modules/core/phaseresolver/src/.libs -laxis2_phaseresolver
\
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                    -L$(top_builddir)/modules/wsdl/src/.libs -laxis2_wsdl
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 

Modified: webservices/axis2/trunk/c/modules/test/unit/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/util/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/util/Makefile.am Fri Dec  2 00:22:50 2005
@@ -12,12 +12,20 @@
 
 include_HEADERS=$(top_builddir)/modules/util/test/*.h
 
-libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
 
 prgbin_PROGRAMS = util_test
 util_test_SOURCES = main.c
-util_test_LDADD   =  $(LDFLAGS) libtest_util.la  $(top_builddir)/modules/util/src/libaxis2_util.la
+util_test_LDADD   =  $(LDFLAGS) libtest_util.la \
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 

Modified: webservices/axis2/trunk/c/modules/test/unit/util/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/util/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/util/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/util/Makefile.in Fri Dec  2 00:22:50 2005
@@ -24,7 +24,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,7 +42,7 @@
 host_triplet = @host@
 target_triplet = @target@
 prgbin_PROGRAMS = util_test$(EXEEXT)
-subdir = modules/util/test
+subdir = modules/test/unit/util
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,9 +65,7 @@
 	"$(DESTDIR)$(includedir)"
 prglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(prglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtest_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/modules/util/src/libaxis2_util.la
+libtest_util_la_LIBADD =
 am_libtest_util_la_OBJECTS = util_hash_test.lo util_stream_test.lo \
 	util_log_test.lo util_error_test.lo util_test.lo \
 	util_array_list_test.lo util_linked_list_test.lo
@@ -76,8 +74,8 @@
 PROGRAMS = $(prgbin_PROGRAMS)
 am_util_test_OBJECTS = main.$(OBJEXT)
 util_test_OBJECTS = $(am_util_test_OBJECTS)
-util_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_util.la \
-	$(top_builddir)/modules/util/src/libaxis2_util.la
+am__DEPENDENCIES_1 =
+util_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_util.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
 am__depfiles_maybe = depfiles
@@ -216,13 +214,22 @@
                             util_linked_list_test.c
 
 include_HEADERS = $(top_builddir)/modules/util/test/*.h
-libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
 
 util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libtest_util.la  $(top_builddir)/modules/util/src/libaxis2_util.la
+util_test_LDADD = $(LDFLAGS) libtest_util.la \
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
+
 all: all-am
 
 .SUFFIXES:
@@ -236,9 +243,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/util/test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/test/unit/util/Makefile';
\
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/util/test/Makefile
+	  $(AUTOMAKE) --gnu  modules/test/unit/util/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.am Fri Dec  2 00:22:50 2005
@@ -7,7 +7,6 @@
                         
 include_HEADERS=$(top_builddir)/modules/xml/om/test/*.h
 
-libtest_om_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
@@ -15,8 +14,12 @@
 prgbin_PROGRAMS = om_test
 om_test_SOURCES = main.c
 om_test_LDADD   =  $(LDFLAGS) libtest_om.la  \
-                   -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
-                   -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                   -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila
\
-                   -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila
-
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila

Modified: webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/xml/om/Makefile.in Fri Dec  2 00:22:50 2005
@@ -24,7 +24,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -42,7 +42,7 @@
 host_triplet = @host@
 target_triplet = @target@
 prgbin_PROGRAMS = om_test$(EXEEXT)
-subdir = modules/xml/om/test
+subdir = modules/test/unit/xml/om
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,14 +65,14 @@
 	"$(DESTDIR)$(includedir)"
 prglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(prglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtest_om_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libtest_om_la_LIBADD =
 am_libtest_om_la_OBJECTS = om_test.lo om_node_test.lo
 libtest_om_la_OBJECTS = $(am_libtest_om_la_OBJECTS)
 prgbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(prgbin_PROGRAMS)
 am_om_test_OBJECTS = main.$(OBJEXT)
 om_test_OBJECTS = $(am_om_test_OBJECTS)
+am__DEPENDENCIES_1 =
 om_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_om.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -205,17 +205,21 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 libtest_om_la_SOURCES = om_test.c om_node_test.c
 include_HEADERS = $(top_builddir)/modules/xml/om/test/*.h
-libtest_om_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
             -I$(top_builddir)/modules/util/src
 
 om_test_SOURCES = main.c
 om_test_LDADD = $(LDFLAGS) libtest_om.la  \
-                   -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
-                   -L$(top_builddir)/modules/util/src/.libs -laxis2_util \
-                   -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila
\
-                   -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila
+                    -L$(top_builddir)/lib \
+                    -laxis2_context \
+                    -laxis2_description \
+                    -laxis2_engine \
+                    -laxis2_wsdl \
+                    -laxis2_phaseresolver \
+                    -laxis2_om \
+                    -laxis2_guththila \
+                    -lguththila
 
 all: all-am
 
@@ -230,9 +234,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/xml/om/test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/test/unit/xml/om/Makefile';
\
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/xml/om/test/Makefile
+	  $(AUTOMAKE) --gnu  modules/test/unit/xml/om/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: webservices/axis2/trunk/c/modules/test/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/util/Makefile.am?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/util/Makefile.am Fri Dec  2 00:22:50 2005
@@ -4,7 +4,6 @@
 AM_CPPFLAGS = $(CPPFLAGS)
 test_util_SOURCES = test_util.c
 
-#test_util_LDADD   =  $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
-test_util_LDADD   =  $(LDFLAGS) -L$(top_builddir)/modules/util/src/.libs -laxis2_util
+test_util_LDADD   =  $(LDFLAGS) -L$(top_builddir)/lib -laxis2_util
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src

Modified: webservices/axis2/trunk/c/modules/test/util/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/util/Makefile.in?rev=351633&r1=351632&r2=351633&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/util/Makefile.in Fri Dec  2 00:22:50 2005
@@ -193,9 +193,7 @@
 SUBDIRS = 
 AM_CPPFLAGS = $(CPPFLAGS)
 test_util_SOURCES = test_util.c
-
-#test_util_LDADD   =  $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
-test_util_LDADD = $(LDFLAGS) -L$(top_builddir)/modules/util/src/.libs -laxis2_util
+test_util_LDADD = $(LDFLAGS) -L$(top_builddir)/lib -laxis2_util
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util/src
 



Mime
View raw message