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 pi...@apache.org on 2006/09/28 06:53:57 UTC

svn commit: r450693 [2/2] - in /webservices/axis2/trunk/c: ./ axiom/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ axiom/test...

Modified: webservices/axis2/trunk/c/woden/src/schema/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/schema/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,12 +1,11 @@
 noinst_LTLIBRARIES = libwoden_schema.la
 
-libwoden_schema_la_SOURCES = \
-							schema.c \
+libwoden_schema_la_SOURCES =schema.c \
 							imported_schema.c \
 							inlined_schema.c \
 							schema_constants.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include 

Modified: webservices/axis2/trunk/c/woden/src/types/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/types/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/types/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/types/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,10 +1,9 @@
 noinst_LTLIBRARIES = libwoden_types.la
 
-libwoden_types_la_SOURCES = \
-							xml_char.c \
+libwoden_types_la_SOURCES = xml_char.c \
 							nc_name.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include

Modified: webservices/axis2/trunk/c/woden/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/util/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,14 +1,13 @@
 TESTS =
 noinst_LTLIBRARIES = libwoden_util.la
 
-libwoden_util_la_SOURCES = \
-								 qname_util.c \
-								 woden_om_util.c
+libwoden_util_la_SOURCES =	qname_util.c \
+							woden_om_util.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include 
 
 EXTRA_DIST = woden_om_util.h
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
 lib_LTLIBRARIES = libwoden_wsdl.la
 
-libwoden_wsdl_la_SOURCES = \
-							wsdl_element.c \
+libwoden_wsdl_la_SOURCES = 	wsdl_element.c \
 							wsdl_obj.c \
 							documentable.c \
 							documentation.c \
@@ -46,15 +45,13 @@
 							
 
 
-libwoden_wsdl_la_LIBADD =  \
-                    $(top_builddir)/src/xml/libwoden_xml.la \
-                    $(top_builddir)/src/util/libwoden_util.la \
-                    $(top_builddir)/src/types/libwoden_types.la \
-                    $(top_builddir)/src/schema/libwoden_schema.la
+libwoden_wsdl_la_LIBADD = $(top_builddir)/src/xml/libwoden_xml.la \
+                    	$(top_builddir)/src/util/libwoden_util.la \
+                    	$(top_builddir)/src/types/libwoden_types.la \
+                    	$(top_builddir)/src/schema/libwoden_schema.la
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
-
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,8 +1,7 @@
 SUBDIRS = xml extensions
 noinst_LTLIBRARIES = libwoden_wsdl10.la
 
-libwoden_wsdl10_la_SOURCES = \
-							msg_ref.c \
+libwoden_wsdl10_la_SOURCES =msg_ref.c \
 							part.c \
 							wsdl10_interface_fault_ref.c \
 							wsdl10_interface_msg_ref.c \
@@ -14,9 +13,9 @@
 							wsdl10_component_model_builder.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include
 
 EXTRA_DIST = woden_wsdl10_component_model_builder.h  woden_wsdl10_constants.h
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,6 +6,6 @@
 							wsdl10_ext_registry.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../util/include \
+			-I ../../../../axiom/include \
+			-I ../../../../xml_schema/include

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/Makefile.am Wed Sep 27 21:53:53 2006
@@ -15,9 +15,9 @@
 											soap_address_exts.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../../util/include \
+			-I ../../../../../axiom/include \
+			-I ../../../../../xml_schema/include
 
 EXTRA_DIST = woden_wsdl10_soap_constants.h
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am Wed Sep 27 21:53:53 2006
@@ -12,6 +12,6 @@
 							wsdl10_svc_element.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../util/include \
+			-I ../../../../axiom/include \
+			-I ../../../../xml_schema/include

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,20 +1,18 @@
 SUBDIRS = xml extensions
 lib_LTLIBRARIES = libwoden.la
 
-libwoden_la_SOURCES = \
-							interface_fault.c \
-							interface_fault_ref.c \
-							interface_msg_ref.c \
-							binding_fault.c \
-							binding_msg_ref.c \
-							binding_op.c \
-							endpoint.c \
-							svc.c \
-							desc.c \
-							component_model_builder.c
+libwoden_la_SOURCES =	interface_fault.c \
+						interface_fault_ref.c \
+						interface_msg_ref.c \
+						binding_fault.c \
+						binding_msg_ref.c \
+						binding_op.c \
+						endpoint.c \
+						svc.c \
+						desc.c \
+						component_model_builder.c
 
-libwoden_la_LIBADD =  \
-                    $(top_builddir)/src/xml/libwoden_xml.la \
+libwoden_la_LIBADD =$(top_builddir)/src/xml/libwoden_xml.la \
                     $(top_builddir)/src/util/libwoden_util.la \
                     $(top_builddir)/src/types/libwoden_types.la \
                     $(top_builddir)/src/builder/libwoden_builder.la \
@@ -28,10 +26,11 @@
                     $(top_builddir)/src/wsdl10/extensions/soap/libwoden_wsdl10_extensions_soap.la \
                     $(top_builddir)/src/wsdl10/libwoden_wsdl10.la \
                     $(top_builddir)/src/wsdl/libwoden_wsdl.la
+
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include
 
 EXTRA_DIST = woden_constants.h woden_component_model_builder.h
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am Wed Sep 27 21:53:53 2006
@@ -6,6 +6,6 @@
 							ext_registry.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../util/include \
+			-I ../../../../axiom/include \
+			-I ../../../../xml_schema/include 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am Wed Sep 27 21:53:53 2006
@@ -14,9 +14,9 @@
 											soap_header_block_deserializer.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../../util/include \
+			-I ../../../../../axiom/include \
+			-I ../../../../../xml_schema/include 
 
 EXTRA_DIST = woden_soap_constants.h
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am Wed Sep 27 21:53:53 2006
@@ -13,6 +13,6 @@
 							svc_element.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../../util/include \
+			-I ../../../../axiom/include \
+			-I ../../../../xml_schema/include

Modified: webservices/axis2/trunk/c/woden/src/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/xml/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libwoden_xml.la
 
-libwoden_xml_la_SOURCES = \
-							xml_attr.c \
+libwoden_xml_la_SOURCES =	xml_attr.c \
 							qname_attr.c \
 							uri_attr.c \
 							qname_list_attr.c \
@@ -11,6 +10,6 @@
 							bool_attr.c
 
 INCLUDES = -I$(top_builddir)/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../../util/include \
+			-I ../../../axiom/include \
+			-I ../../../xml_schema/include

Modified: webservices/axis2/trunk/c/woden/test/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/test/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/woden/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/test/Makefile.am Wed Sep 27 21:53:53 2006
@@ -8,9 +8,9 @@
 
 INCLUDES = -I$(top_builddir)/include \
             -I${CUTEST_HOME}/include \
-			@AXIOMINC@ \
-			@UTILINC@ \
-			@XMLSCHEMAINC@
+			-I ../../axiom/include \
+			-I ../../util/include \
+			-I ../../xml_schema/include 
 
 noinst_PROGRAMS = woden_test
 check_PROGRAMS = woden_test
@@ -20,10 +20,10 @@
 					  ../src/wsdl20/libwoden.la \
                      -L$(CUTEST_HOME)/lib \
                      -lcutest \
-                   	-laxis2_util \
-					-laxis2_axiom \
-					-laxis2_xml_schema \
-                    -laxis2_parser \
+					 ../../util/src/libaxis2_util.la \
+					 ../../axiom/src/om/libaxis2_axiom.la \
+					 ../../xml_schema/src/libaxis2_xml_schema.la \
+					 ../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/xml_schema/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/Makefile.am (original)
+++ webservices/axis2/trunk/c/xml_schema/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,7 +1,7 @@
 TESTS =
-SUBDIRS = src $(TESTDIR) samples
+SUBDIRS = src $(TESTDIR) 
 include_HEADERS=$(top_builddir)/include/*.h
-EXTRA_DIST = build.sh autogen.sh LICENSE
+EXTRA_DIST = build.sh autogen.sh LICENSE samples
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
 	rm -rf `find $(distdir)/ -type d -name .deps`

Modified: webservices/axis2/trunk/c/xml_schema/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/configure.ac?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/configure.ac (original)
+++ webservices/axis2/trunk/c/xml_schema/configure.ac Wed Sep 27 21:53:53 2006
@@ -38,6 +38,38 @@
 AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
+AC_MSG_CHECKING(whether to build libxml2 xml parser library)
+AC_ARG_ENABLE(libxml2, [  --enable-libxml2    build libxml2 xml parser library wrapper. default=yes],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    PARSER_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    PARSER_DIR="libxml2"
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  PARSER_DIR="libxml2"
+)
+
+AC_MSG_CHECKING(whether to build guththila xml parser library)
+AC_ARG_ENABLE(guththila, [  --enable-guththila    build guththila xml parser library wrapper. default=no],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    PARSER_DIR="guththila"
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
 AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
 AC_ARG_WITH(axiom,
 [  --with-axiom[=PATH]      use axiom.],
@@ -109,11 +141,11 @@
 AC_SUBST(UTILINC)
 AC_SUBST(AXIOMINC)
 AC_SUBST(TESTDIR)
+AC_SUBST(PARSER_DIR)
 
 AC_CONFIG_FILES([Makefile
     src/Makefile \
-    test/Makefile \
-    samples/Makefile
+    test/Makefile
     ])
     
 AC_OUTPUT

Modified: webservices/axis2/trunk/c/xml_schema/samples/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/samples/Makefile.am (original)
+++ webservices/axis2/trunk/c/xml_schema/samples/Makefile.am Wed Sep 27 21:53:53 2006
@@ -4,10 +4,8 @@
 check_PROGRAMS = test_schema
 test_schema_SOURCES = test_schema.c
 
-test_schema_LDADD   =   \
-			$(top_builddir)/src/libaxis2_xml_schema.la \
-			-laxis2_axiom \
-			-laxis2_parser 
+test_schema_LDADD   = -laxis2_xml_schema  \
+						-laxis2_axiom \
+						-laxis2_parser
 
-INCLUDES = -I$(top_builddir)/include \
-		@UTILINC@ 
+INCLUDES = -I$(AXIS2C_HOME)/include 

Modified: webservices/axis2/trunk/c/xml_schema/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/xml_schema/src/Makefile.am Wed Sep 27 21:53:53 2006
@@ -1,55 +1,53 @@
 TESTS =
 lib_LTLIBRARIES = libaxis2_xml_schema.la
-libaxis2_xml_schema_la_SOURCES = \
-				xml_schema_enum.c \
-				xml_schema_obj.c \
-				xml_schema_annotation.c \
-				xml_schema_annotated.c \
-				xml_schema_use.c \
-				xml_schema_content_processing.c \
-				xml_schema_particle.c \
-				xml_schema_any.c \
-				xml_schema_app_info.c \
-				xml_schema_obj_collection.c \
-				xml_schema_group_base.c \
-				xml_schema_group.c \
-				xml_schema_group_ref.c \
-				xml_schema_form.c \
-				xml_tokenized_type.c \
-				xml_schema_data_type.c \
-				xml_schema_facet.c \
-				xml_schema_xpath.c \
-				xml_schema_identity_constraint.c \
-				xml_schema_derivation_method.c \
-				xml_schema_obj_table.c \
-				xml_schema_collection.c \
-				xml_schema_type.c \
-				xml_schema_element.c \
-				xml_schema_any_attribute.c \
-				xml_schema_builder.c \
-				xml_schema_external.c \
-				xml_schema_import.c \
-				xml_schema_redefine.c \
-				xml_schema_simple_content.c \
-				xml_schema_simple_content_extension.c \
-				xml_schema_simple_content_restriction.c \
-				xml_schema_simple_type.c \
-				xml_schema_simple_type_content.c \
-				xml_schema_simple_type_list.c \
-				xml_schema_simple_type_restriction.c \
-				xml_schema_simple_type_union.c \
-				xml_schema_complex_type.c \
-				xml_schema_documentation.c \
-				xml_schema_url_resolver.c \
-				xml_schema_attribute.c \
-				xml_schema_complex_content_extension.c \
-				xml_schema_complex_content.c \
-				xml_schema_attribute_group_ref.c \
-				xml_schema_input_source.c \
-				xml_schema.c 
-                                 
+libaxis2_xml_schema_la_SOURCES =	xml_schema_enum.c \
+									xml_schema_obj.c \
+									xml_schema_annotation.c \
+									xml_schema_annotated.c \
+									xml_schema_use.c \
+									xml_schema_content_processing.c \
+									xml_schema_particle.c \
+									xml_schema_any.c \
+									xml_schema_app_info.c \
+									xml_schema_obj_collection.c \
+									xml_schema_group_base.c \
+									xml_schema_group.c \
+									xml_schema_group_ref.c \
+									xml_schema_form.c \
+									xml_tokenized_type.c \
+									xml_schema_data_type.c \
+									xml_schema_facet.c \
+									xml_schema_xpath.c \
+									xml_schema_identity_constraint.c \
+									xml_schema_derivation_method.c \
+									xml_schema_obj_table.c \
+									xml_schema_collection.c \
+									xml_schema_type.c \
+									xml_schema_element.c \
+									xml_schema_any_attribute.c \
+									xml_schema_builder.c \
+									xml_schema_external.c \
+									xml_schema_import.c \
+									xml_schema_redefine.c \
+									xml_schema_simple_content.c \
+									xml_schema_simple_content_extension.c \
+									xml_schema_simple_content_restriction.c \
+									xml_schema_simple_type.c \
+									xml_schema_simple_type_content.c \
+									xml_schema_simple_type_list.c \
+									xml_schema_simple_type_restriction.c \
+									xml_schema_simple_type_union.c \
+									xml_schema_complex_type.c \
+									xml_schema_documentation.c \
+									xml_schema_url_resolver.c \
+									xml_schema_attribute.c \
+									xml_schema_complex_content_extension.c \
+									xml_schema_complex_content.c \
+									xml_schema_attribute_group_ref.c \
+									xml_schema_input_source.c \
+									xml_schema.c 
+											 
 
 INCLUDES = -I$(top_builddir)/include \
-           @AXIOMINC@ \
-		   @UTILINC@
-
+			-I ../../util/include \
+			-I ../../axiom/include

Modified: webservices/axis2/trunk/c/xml_schema/test/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/Makefile.am?view=diff&rev=450693&r1=450692&r2=450693
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/xml_schema/test/Makefile.am Wed Sep 27 21:53:53 2006
@@ -7,19 +7,18 @@
 
 xml_schema_test_SOURCES = main.c xml_schema_test.c
                  
-xml_schema_test_LDADD   =   \
-			-L$(CUTEST_HOME)/lib \
-			-lcutest \
-			-laxis2_util \
-			-laxis2_axiom \
-			-laxis2_parser \
-			$(top_builddir)/src/libaxis2_xml_schema.la \
-			$(LIBXML2_LIBS)
+xml_schema_test_LDADD   =	-L$(CUTEST_HOME)/lib \
+						-lcutest \
+						../../util/src/libaxis2_util.la \
+						../../axiom/src/om/libaxis2_axiom.la \
+						../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+						$(top_builddir)/src/libaxis2_xml_schema.la \
+						$(LIBXML2_LIBS)
                     
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/axiom/include \
+            -I ../../axiom/include \
             -I$(top_builddir)/xml_schema/include \
             -I${CUTEST_HOME}/include \
-            @UTILINC@
+			-I ../../util/include 
 
 EXTRA_DIST = xml_schema_test.h



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