You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2005/10/20 08:19:53 UTC
svn commit: r326836 - in /webservices/axis2/trunk/c: include/
modules/common/src/ modules/common/test/ modules/core/context/src/
modules/core/description/src/ modules/core/engine/src/ modules/test/common/
modules/test/om/src/ modules/test/unit/ modules...
Author: damitha
Date: Wed Oct 19 23:19:00 2005
New Revision: 326836
URL: http://svn.apache.org/viewcvs?rev=326836&view=rev
Log:
Prefixed all library names with axis2_
ex.
before
libutil.so
now
libaxis2_util.so
Modified:
webservices/axis2/trunk/c/include/axis2_description_service.h
webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
webservices/axis2/trunk/c/modules/common/src/Makefile.am
webservices/axis2/trunk/c/modules/common/src/Makefile.in
webservices/axis2/trunk/c/modules/common/test/Makefile.am
webservices/axis2/trunk/c/modules/common/test/Makefile.in
webservices/axis2/trunk/c/modules/core/context/src/Makefile.am
webservices/axis2/trunk/c/modules/core/context/src/Makefile.in
webservices/axis2/trunk/c/modules/core/description/src/Makefile.am
webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am
webservices/axis2/trunk/c/modules/core/engine/src/Makefile.in
webservices/axis2/trunk/c/modules/test/common/Makefile.am
webservices/axis2/trunk/c/modules/test/common/Makefile.in
webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
webservices/axis2/trunk/c/modules/test/om/src/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/util/Makefile.am
webservices/axis2/trunk/c/modules/test/util/Makefile.in
webservices/axis2/trunk/c/modules/util/src/Makefile.am
webservices/axis2/trunk/c/modules/util/src/Makefile.in
webservices/axis2/trunk/c/modules/util/test/Makefile.am
webservices/axis2/trunk/c/modules/util/test/Makefile.in
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in
webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.in
Modified: webservices/axis2/trunk/c/include/axis2_description_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_service.h?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_service.h Wed Oct 19 23:19:00 2005
@@ -47,7 +47,47 @@
*/
/**************************** Start of function macros ************************/
+
+#define axis2_description_service_free(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->free \
+ (env, service_desc));
+#define axis2_description_service_add_param(env, service_desc, param) \
+ (axis2_description_service_get_ops(env, service_desc)->add_param \
+ (env, service_desc, param));
+
+#define axis2_description_service_get_param(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_param \
+ (env, service_desc));
+
+#define axis2_description_service_get_params(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_params \
+ (env, service_desc));
+
+#define axis2_description_service_add_operation(env, service_desc, operation_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->add_operation \
+ (env, service_desc, operation_desc));
+
+#define axis2_description_service_get_operation_with_qname(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_operation_with_qname \
+ (env, service_desc));
+
+#define axis2_description_service_get_operation_with_name(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_operation_with_name \
+ (env, service_desc));
+
+#define axis2_description_service_get_operations(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_operations \
+ (env, service_desc));
+
+#define axis2_description_service_set_parent(env, service_desc \
+ , servicegroup_desc) (axis2_description_service_get_ops(env, \
+ service_desc)->set_parent (env, service_desc, servicegroup_desc));
+
+#define axis2_description_service_get_parent(env, service_desc) \
+ (axis2_description_service_get_ops(env, service_desc)->get_parent \
+ (env, service_desc));
+
/**************************** End of function macros **************************/
/**************************** Function pointers *******************************/
Modified: webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_servicegroup.h?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_servicegroup.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_servicegroup.h Wed Oct 19 23:19:00 2005
@@ -43,12 +43,24 @@
* @ingroup axis2_description
* @{
*/
+
+/**************************** Start of function macros ************************/
+
+#define axis2_description_servicegroup_add_service(env, servicegroup_desc \
+ , service_desc) (axis2_description_service_get_ops(env, \
+ servicegroup_desc)->get_param (env, servicegroup_desc, service_desc));
+/**************************** End of function macros **************************/
/**************************** Function pointers *******************************/
+/** Add a service to the serivce group
+ * @param service to be added
+ * @return status code
+ */
typedef axis2_status_t (*axis2_description_servicegroup_add_service_t)
(axis2_environment_t *env
- , axis2_description_servicegroup_t* service_group);
+ , axis2_description_servicegroup_t *servicegroup_desc
+ , axis2_description_service_t *service_desc);
/*************************** End of function pointers *************************/
@@ -58,6 +70,10 @@
};
axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
+ (axis2_environment_t *env
+ , axis2_description_servicegroup_t *servicegroup_desc);
+
+axis2_description_servicegroup_t *axis2_description_servicegroup_create
(axis2_environment_t *env);
/** @} */
Modified: webservices/axis2/trunk/c/modules/common/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libcommon.la
+lib_LTLIBRARIES = libaxis2_common.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = axis2.c
+libaxis2_common_la_SOURCES = axis2.c
-libcommon_la_LIBADD = $(LDFLAGS)
+libaxis2_common_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/modules/common/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libcommon_la_SOURCES)
+SOURCES = $(libaxis2_common_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -62,9 +62,9 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libcommon_la_OBJECTS = axis2.lo
-libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS)
+libaxis2_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_common_la_OBJECTS = axis2.lo
+libaxis2_common_la_OBJECTS = $(am_libaxis2_common_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -76,8 +76,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libcommon_la_SOURCES)
-DIST_SOURCES = $(libcommon_la_SOURCES)
+SOURCES = $(libaxis2_common_la_SOURCES)
+DIST_SOURCES = $(libaxis2_common_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -189,10 +189,10 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-lib_LTLIBRARIES = libcommon.la
+lib_LTLIBRARIES = libaxis2_common.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = axis2.c
-libcommon_la_LIBADD = $(LDFLAGS)
+libaxis2_common_la_SOURCES = axis2.c
+libaxis2_common_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
all: all-am
@@ -254,8 +254,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libcommon_la_LDFLAGS) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
+libaxis2_common.la: $(libaxis2_common_la_OBJECTS) $(libaxis2_common_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libaxis2_common_la_LDFLAGS) $(libaxis2_common_la_OBJECTS) $(libaxis2_common_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Modified: webservices/axis2/trunk/c/modules/common/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.am Wed Oct 19 23:19:00 2005
@@ -5,11 +5,11 @@
libtest_common_la_SOURCES = common_test.c
include_HEADERS=$(top_builddir)/modules/common/test/*.h
libtest_common_la_LIBADD = $(LDFLAGS) \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
prgbin_PROGRAMS = common_test
common_test_SOURCES = main.c
common_test_LDADD = $(LDFLAGS) libtest_common.la \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
Modified: webservices/axis2/trunk/c/modules/common/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.in Wed Oct 19 23:19:00 2005
@@ -68,7 +68,7 @@
LTLIBRARIES = $(prglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libtest_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
am_libtest_common_la_OBJECTS = common_test.lo
libtest_common_la_OBJECTS = $(am_libtest_common_la_OBJECTS)
prgbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -76,7 +76,7 @@
am_common_test_OBJECTS = main.$(OBJEXT)
common_test_OBJECTS = $(am_common_test_OBJECTS)
common_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_common.la \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -210,12 +210,12 @@
libtest_common_la_SOURCES = common_test.c
include_HEADERS = $(top_builddir)/modules/common/test/*.h
libtest_common_la_LIBADD = $(LDFLAGS) \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
common_test_SOURCES = main.c
common_test_LDADD = $(LDFLAGS) libtest_common.la \
- $(top_builddir)/modules/common/src/libcommon.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la
all: all-am
Modified: webservices/axis2/trunk/c/modules/core/context/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libcontext.la
+noinst_LTLIBRARIES = libaxis2_context.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcontext_la_SOURCES = axis2_context_msg_context.c
+libaxis2_context_la_SOURCES = axis2_context_msg_context.c
-libcontext_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include -I../../../xml/guththila/src -I../../../../include
+libaxis2_context_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/modules/xml/guththila/src -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/modules/core/context/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libcontext_la_SOURCES)
+SOURCES = $(libaxis2_context_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -54,9 +54,9 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libcontext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libcontext_la_OBJECTS = axis2_context_msg_context.lo
-libcontext_la_OBJECTS = $(am_libcontext_la_OBJECTS)
+libaxis2_context_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_context_la_OBJECTS = axis2_context_msg_context.lo
+libaxis2_context_la_OBJECTS = $(am_libaxis2_context_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -68,8 +68,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libcontext_la_SOURCES)
-DIST_SOURCES = $(libcontext_la_SOURCES)
+SOURCES = $(libaxis2_context_la_SOURCES)
+DIST_SOURCES = $(libaxis2_context_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -181,11 +181,11 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-noinst_LTLIBRARIES = libcontext.la
+noinst_LTLIBRARIES = libaxis2_context.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcontext_la_SOURCES = axis2_context_msg_context.c
-libcontext_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include -I../../../xml/guththila/src -I../../../../include
+libaxis2_context_la_SOURCES = axis2_context_msg_context.c
+libaxis2_context_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/modules/xml/guththila/src -I$(top_builddir)/include
all: all-am
.SUFFIXES:
@@ -228,8 +228,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libcontext.la: $(libcontext_la_OBJECTS) $(libcontext_la_DEPENDENCIES)
- $(LINK) $(libcontext_la_LDFLAGS) $(libcontext_la_OBJECTS) $(libcontext_la_LIBADD) $(LIBS)
+libaxis2_context.la: $(libaxis2_context_la_OBJECTS) $(libaxis2_context_la_DEPENDENCIES)
+ $(LINK) $(libaxis2_context_la_LDFLAGS) $(libaxis2_context_la_OBJECTS) $(libaxis2_context_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,12 +1,12 @@
-noinst_LTLIBRARIES = libdescription.la
+noinst_LTLIBRARIES = libaxis2_description.la
AM_CPPFLAGS = $(CPPFLAGS)
-libdescription_la_SOURCES = axis2_description_param_include.c \
+libaxis2_description_la_SOURCES = axis2_description_param_include.c \
axis2_description_operation.c \
axis2_description_service.c \
axis2_description_module.c \
axis2_description_parameter.c \
axis2_description_servicegroup.c
-libdescription_la_LIBADD = $(LDFLAGS)
+libaxis2_description_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
-I$(top_builddir)/modules/xml/guththila/src
Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libdescription_la_SOURCES)
+SOURCES = $(libaxis2_description_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -54,12 +54,14 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libdescription_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libdescription_la_OBJECTS = axis2_description_param_include.lo \
+libaxis2_description_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_description_la_OBJECTS = \
+ axis2_description_param_include.lo \
axis2_description_operation.lo axis2_description_service.lo \
axis2_description_module.lo axis2_description_parameter.lo \
axis2_description_servicegroup.lo
-libdescription_la_OBJECTS = $(am_libdescription_la_OBJECTS)
+libaxis2_description_la_OBJECTS = \
+ $(am_libaxis2_description_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -71,8 +73,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libdescription_la_SOURCES)
-DIST_SOURCES = $(libdescription_la_SOURCES)
+SOURCES = $(libaxis2_description_la_SOURCES)
+DIST_SOURCES = $(libaxis2_description_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -184,16 +186,16 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-noinst_LTLIBRARIES = libdescription.la
+noinst_LTLIBRARIES = libaxis2_description.la
AM_CPPFLAGS = $(CPPFLAGS)
-libdescription_la_SOURCES = axis2_description_param_include.c \
+libaxis2_description_la_SOURCES = axis2_description_param_include.c \
axis2_description_operation.c \
axis2_description_service.c \
axis2_description_module.c \
axis2_description_parameter.c \
axis2_description_servicegroup.c
-libdescription_la_LIBADD = $(LDFLAGS)
+libaxis2_description_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
-I$(top_builddir)/modules/xml/guththila/src
@@ -239,8 +241,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libdescription.la: $(libdescription_la_OBJECTS) $(libdescription_la_DEPENDENCIES)
- $(LINK) $(libdescription_la_LDFLAGS) $(libdescription_la_OBJECTS) $(libdescription_la_LIBADD) $(LIBS)
+libaxis2_description.la: $(libaxis2_description_la_OBJECTS) $(libaxis2_description_la_DEPENDENCIES)
+ $(LINK) $(libaxis2_description_la_LDFLAGS) $(libaxis2_description_la_OBJECTS) $(libaxis2_description_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c Wed Oct 19 23:19:00 2005
@@ -15,7 +15,7 @@
};
-/*************************** Function pointers ********************************/
+/*************************** Function headers ********************************/
axis2_status_t axis2_description_service_ops_free (axis2_environment_t *env
, axis2_description_service_t *service_desc);
@@ -55,7 +55,7 @@
axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
(axis2_environment_t *env, axis2_description_service_t *service_desc);
-/************************* End of function pointers ***************************/
+/************************* End of function headers ***************************/
axis2_description_service_ops_t * axis2_description_service_get_ops
(axis2_environment_t *env, axis2_description_service_t *service_desc)
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c Wed Oct 19 23:19:00 2005
@@ -32,18 +32,30 @@
axis2_status_t axis2_description_servicegroup_ops_add_service
(axis2_environment_t *env
- , axis2_description_servicegroup_t* service_group);
+ , axis2_description_servicegroup_t* servicegroup_desc
+ , axis2_description_service_t *service_desc);
/***************************** End of function headers ************************/
axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
- (axis2_environment_t *env);
+ (axis2_environment_t *env
+ , axis2_description_servicegroup_t *servicegroup_desc)
+{
+ return NULL;
+}
+
+axis2_description_servicegroup_t *axis2_description_servicegroup_create
+ (axis2_environment_t *env)
+{
+ return NULL;
+}
/******************************************************************************/
axis2_status_t axis2_description_servicegroup_ops_add_service
(axis2_environment_t *env
- , axis2_description_servicegroup_t* service_group)
+ , axis2_description_servicegroup_t *servicegroup_desc
+ , axis2_description_service_t *service_desc)
{
return 0;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libengine.la
+noinst_LTLIBRARIES = libaxis2_engine.la
AM_CPPFLAGS = $(CPPFLAGS)
-libengine_la_SOURCES = axis2_engine_config.c axis2_engine_msg_receiver.c
+libaxis2_engine_la_SOURCES = axis2_engine_config.c axis2_engine_msg_receiver.c
-libengine_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include -I../../../xml/guththila/src -I../../../../include
+libaxis2_engine_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/modules/xml/guththila/src -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/modules/core/engine/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libengine_la_SOURCES)
+SOURCES = $(libaxis2_engine_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -54,10 +54,10 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libengine_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libengine_la_OBJECTS = axis2_engine_config.lo \
+libaxis2_engine_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_engine_la_OBJECTS = axis2_engine_config.lo \
axis2_engine_msg_receiver.lo
-libengine_la_OBJECTS = $(am_libengine_la_OBJECTS)
+libaxis2_engine_la_OBJECTS = $(am_libaxis2_engine_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -69,8 +69,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libengine_la_SOURCES)
-DIST_SOURCES = $(libengine_la_SOURCES)
+SOURCES = $(libaxis2_engine_la_SOURCES)
+DIST_SOURCES = $(libaxis2_engine_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -182,11 +182,11 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-noinst_LTLIBRARIES = libengine.la
+noinst_LTLIBRARIES = libaxis2_engine.la
AM_CPPFLAGS = $(CPPFLAGS)
-libengine_la_SOURCES = axis2_engine_config.c axis2_engine_msg_receiver.c
-libengine_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include -I../../../xml/guththila/src -I../../../../include
+libaxis2_engine_la_SOURCES = axis2_engine_config.c axis2_engine_msg_receiver.c
+libaxis2_engine_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/modules/xml/guththila/src -I$(top_builddir)/include
all: all-am
.SUFFIXES:
@@ -229,8 +229,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libengine.la: $(libengine_la_OBJECTS) $(libengine_la_DEPENDENCIES)
- $(LINK) $(libengine_la_LDFLAGS) $(libengine_la_OBJECTS) $(libengine_la_LIBADD) $(LIBS)
+libaxis2_engine.la: $(libaxis2_engine_la_OBJECTS) $(libaxis2_engine_la_DEPENDENCIES)
+ $(LINK) $(libaxis2_engine_la_LDFLAGS) $(libaxis2_engine_la_OBJECTS) $(libaxis2_engine_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.am Wed Oct 19 23:19:00 2005
@@ -4,5 +4,5 @@
AM_CPPFLAGS = $(CPPFLAGS)
test_common_SOURCES = test_common.c
-test_common_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I../../../include
+test_common_LDADD = $(LDFLAGS) ../../common/src/libaxis2_common.la
+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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.in Wed Oct 19 23:19:00 2005
@@ -60,7 +60,7 @@
test_common_OBJECTS = $(am_test_common_OBJECTS)
am__DEPENDENCIES_1 =
test_common_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- ../../common/src/libcommon.la
+ ../../common/src/libaxis2_common.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -196,8 +196,8 @@
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
test_common_SOURCES = test_common.c
-test_common_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I../../../include
+test_common_LDADD = $(LDFLAGS) ../../common/src/libaxis2_common.la
+INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
all: all-recursive
.SUFFIXES:
Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -4,8 +4,8 @@
AM_CPPFLAGS = $(CPPFLAGS) -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -O2 -pthread
test_om_SOURCES = test_om.c
-test_om_LDADD = $(LDFLAGS) $(top_builddir)/modules/xml/om/src/libom.la \
+test_om_LDADD = $(LDFLAGS) $(top_builddir)/modules/xml/om/src/libaxis2_om.la \
$(top_builddir)/modules/xml/guththila/src/libguththila.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
- -I$(top_builddir)/modules/xml/guththila/src -I${APR_HOME}/include/apr-1
+ -I$(top_builddir)/modules/xml/guththila/src
Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -60,7 +60,7 @@
test_om_OBJECTS = $(am_test_om_OBJECTS)
am__DEPENDENCIES_1 =
test_om_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/modules/xml/om/src/libom.la \
+ $(top_builddir)/modules/xml/om/src/libaxis2_om.la \
$(top_builddir)/modules/xml/guththila/src/libguththila.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -197,11 +197,11 @@
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS) -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -O2 -pthread
test_om_SOURCES = test_om.c
-test_om_LDADD = $(LDFLAGS) $(top_builddir)/modules/xml/om/src/libom.la \
+test_om_LDADD = $(LDFLAGS) $(top_builddir)/modules/xml/om/src/libaxis2_om.la \
$(top_builddir)/modules/xml/guththila/src/libguththila.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
- -I$(top_builddir)/modules/xml/guththila/src -I${APR_HOME}/include/apr-1
+ -I$(top_builddir)/modules/xml/guththila/src
all: all-recursive
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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.am Wed Oct 19 23:19:00 2005
@@ -7,7 +7,7 @@
main_unit_test_suite_LDADD = $(LDFLAGS) \
$(top_builddir)/modules/common/test/libtest_common.la \
$(top_builddir)/modules/util/test/libtest_util.la \
- $(top_builddir)/modules/common/src/libcommon.la \
- $(top_builddir)/modules/util/src/libutil.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la \
+ $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.in Wed Oct 19 23:19:00 2005
@@ -62,8 +62,8 @@
main_unit_test_suite_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/modules/common/test/libtest_common.la \
$(top_builddir)/modules/util/test/libtest_util.la \
- $(top_builddir)/modules/common/src/libcommon.la \
- $(top_builddir)/modules/util/src/libutil.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la \
+ $(top_builddir)/modules/util/src/libaxis2_util.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -202,8 +202,8 @@
main_unit_test_suite_LDADD = $(LDFLAGS) \
$(top_builddir)/modules/common/test/libtest_common.la \
$(top_builddir)/modules/util/test/libtest_util.la \
- $(top_builddir)/modules/common/src/libcommon.la \
- $(top_builddir)/modules/util/src/libutil.la
+ $(top_builddir)/modules/common/src/libaxis2_common.la \
+ $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
all: all-recursive
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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/util/Makefile.am Wed Oct 19 23:19:00 2005
@@ -4,5 +4,5 @@
AM_CPPFLAGS = $(CPPFLAGS)
test_util_SOURCES = test_util.c
-test_util_LDADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libutil.la
+test_util_LDADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
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=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/util/Makefile.in Wed Oct 19 23:19:00 2005
@@ -60,7 +60,7 @@
test_util_OBJECTS = $(am_test_util_OBJECTS)
am__DEPENDENCIES_1 =
test_util_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/modules/util/src/libutil.la
+ $(top_builddir)/modules/util/src/libaxis2_util.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -196,7 +196,7 @@
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
test_util_SOURCES = test_util.c
-test_util_LDADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libutil.la
+test_util_LDADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
all: all-recursive
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libutil.la
+lib_LTLIBRARIES = libaxis2_util.la
AM_CPPFLAGS = $(CPPFLAGS)
-libutil_la_SOURCES = axis2_hash.c \
+libaxis2_util_la_SOURCES = axis2_hash.c \
axis2_allocator.c \
axis2_environment.c \
axis2_error.c \
@@ -8,5 +8,5 @@
axis2_log.c \
axis2_string.c
-libutil_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../include -I${CUTEST_HOME}/include
+libaxis2_util_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libutil_la_SOURCES)
+SOURCES = $(libaxis2_util_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -62,11 +62,11 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libutil_la_OBJECTS = axis2_hash.lo axis2_allocator.lo \
+libaxis2_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_util_la_OBJECTS = axis2_hash.lo axis2_allocator.lo \
axis2_environment.lo axis2_error.lo axis2_stream.lo \
axis2_log.lo axis2_string.lo
-libutil_la_OBJECTS = $(am_libutil_la_OBJECTS)
+libaxis2_util_la_OBJECTS = $(am_libaxis2_util_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -78,8 +78,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libutil_la_SOURCES)
-DIST_SOURCES = $(libutil_la_SOURCES)
+SOURCES = $(libaxis2_util_la_SOURCES)
+DIST_SOURCES = $(libaxis2_util_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -191,9 +191,9 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-lib_LTLIBRARIES = libutil.la
+lib_LTLIBRARIES = libaxis2_util.la
AM_CPPFLAGS = $(CPPFLAGS)
-libutil_la_SOURCES = axis2_hash.c \
+libaxis2_util_la_SOURCES = axis2_hash.c \
axis2_allocator.c \
axis2_environment.c \
axis2_error.c \
@@ -201,8 +201,8 @@
axis2_log.c \
axis2_string.c
-libutil_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../include -I${CUTEST_HOME}/include
+libaxis2_util_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
all: all-am
.SUFFIXES:
@@ -263,8 +263,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libutil.la: $(libutil_la_OBJECTS) $(libutil_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libutil_la_LDFLAGS) $(libutil_la_OBJECTS) $(libutil_la_LIBADD) $(LIBS)
+libaxis2_util.la: $(libaxis2_util_la_OBJECTS) $(libaxis2_util_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libaxis2_util_la_LDFLAGS) $(libaxis2_util_la_OBJECTS) $(libaxis2_util_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Modified: webservices/axis2/trunk/c/modules/util/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/test/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/test/Makefile.am Wed Oct 19 23:19:00 2005
@@ -5,10 +5,10 @@
libtest_util_la_SOURCES = util_hash_test.c util_stream_test.c util_log_test.c util_error_test.c util_test.c
include_HEADERS=$(top_builddir)/modules/util/test/*.h
-libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libutil.la
+libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
prgbin_PROGRAMS = util_test
util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libtest_util.la $(top_builddir)/modules/util/src/libutil.la
+util_test_LDADD = $(LDFLAGS) libtest_util.la $(top_builddir)/modules/util/src/libaxis2_util.la
Modified: webservices/axis2/trunk/c/modules/util/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/test/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/util/test/Makefile.in Wed Oct 19 23:19:00 2005
@@ -68,7 +68,7 @@
LTLIBRARIES = $(prglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libtest_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/modules/util/src/libutil.la
+ $(top_builddir)/modules/util/src/libaxis2_util.la
am_libtest_util_la_OBJECTS = util_hash_test.lo util_stream_test.lo \
util_log_test.lo util_error_test.lo util_test.lo
libtest_util_la_OBJECTS = $(am_libtest_util_la_OBJECTS)
@@ -77,7 +77,7 @@
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/libutil.la
+ $(top_builddir)/modules/util/src/libaxis2_util.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -210,10 +210,10 @@
AM_CPPFLAGS = $(CPPFLAGS)
libtest_util_la_SOURCES = util_hash_test.c util_stream_test.c util_log_test.c util_error_test.c util_test.c
include_HEADERS = $(top_builddir)/modules/util/test/*.h
-libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libutil.la
+libtest_util_la_LIBADD = $(LDFLAGS) $(top_builddir)/modules/util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libtest_util.la $(top_builddir)/modules/util/src/libutil.la
+util_test_LDADD = $(LDFLAGS) libtest_util.la $(top_builddir)/modules/util/src/libaxis2_util.la
all: all-am
.SUFFIXES:
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,16 @@
-lib_LTLIBRARIES = libom.la
+lib_LTLIBRARIES = libaxis2_om.la
AM_CPPFLAGS = $(CPPFLAGS)
-libom_la_SOURCES = axis2_om_attribute.c axis2_om_document.c axis2_om_node.c axis2_om_text.c axis2_om_comment.c axis2_om_element.c axis2_om_output.c axis2_qname.c axis2_om_doctype.c axis2_om_namespace.c axis2_om_processing_instruction.c axis2_om_stax_builder.c
+libaxis2_om_la_SOURCES = axis2_om_attribute.c \
+ axis2_om_document.c \
+ axis2_om_node.c \
+ axis2_om_text.c \
+ axis2_om_comment.c \
+ axis2_om_element.c \
+ axis2_om_output.c \
+ axis2_qname.c axis2_om_doctype.c \
+ axis2_om_namespace.c \
+ axis2_om_processing_instruction.c \
+ axis2_om_stax_builder.c
-libom_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../../include -I../../guththila/src -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+libaxis2_om_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/modules/xml/guththila/src -I${CUTEST_HOME}/include
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libom_la_SOURCES)
+SOURCES = $(libaxis2_om_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -62,13 +62,13 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libom_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libom_la_OBJECTS = axis2_om_attribute.lo axis2_om_document.lo \
+libaxis2_om_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_om_la_OBJECTS = axis2_om_attribute.lo axis2_om_document.lo \
axis2_om_node.lo axis2_om_text.lo axis2_om_comment.lo \
axis2_om_element.lo axis2_om_output.lo axis2_qname.lo \
axis2_om_doctype.lo axis2_om_namespace.lo \
axis2_om_processing_instruction.lo axis2_om_stax_builder.lo
-libom_la_OBJECTS = $(am_libom_la_OBJECTS)
+libaxis2_om_la_OBJECTS = $(am_libaxis2_om_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -80,8 +80,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libom_la_SOURCES)
-DIST_SOURCES = $(libom_la_SOURCES)
+SOURCES = $(libaxis2_om_la_SOURCES)
+DIST_SOURCES = $(libaxis2_om_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -193,11 +193,22 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-lib_LTLIBRARIES = libom.la
+lib_LTLIBRARIES = libaxis2_om.la
AM_CPPFLAGS = $(CPPFLAGS)
-libom_la_SOURCES = axis2_om_attribute.c axis2_om_document.c axis2_om_node.c axis2_om_text.c axis2_om_comment.c axis2_om_element.c axis2_om_output.c axis2_qname.c axis2_om_doctype.c axis2_om_namespace.c axis2_om_processing_instruction.c axis2_om_stax_builder.c
-libom_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../../include -I../../guththila/src -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+libaxis2_om_la_SOURCES = axis2_om_attribute.c \
+ axis2_om_document.c \
+ axis2_om_node.c \
+ axis2_om_text.c \
+ axis2_om_comment.c \
+ axis2_om_element.c \
+ axis2_om_output.c \
+ axis2_qname.c axis2_om_doctype.c \
+ axis2_om_namespace.c \
+ axis2_om_processing_instruction.c \
+ axis2_om_stax_builder.c
+
+libaxis2_om_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/modules/xml/guththila/src -I${CUTEST_HOME}/include
all: all-am
.SUFFIXES:
@@ -258,8 +269,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libom.la: $(libom_la_OBJECTS) $(libom_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libom_la_LDFLAGS) $(libom_la_OBJECTS) $(libom_la_LIBADD) $(LIBS)
+libaxis2_om.la: $(libaxis2_om_la_OBJECTS) $(libaxis2_om_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libaxis2_om_la_LDFLAGS) $(libaxis2_om_la_OBJECTS) $(libaxis2_om_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Modified: webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.am?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.am Wed Oct 19 23:19:00 2005
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libsoap.la
+noinst_LTLIBRARIES = libaxis2_soap.la
AM_CPPFLAGS = $(CPPFLAGS)
-libsoap_la_SOURCES =
+libaxis2_soap_la_SOURCES =
-libsoap_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../../include -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+libaxis2_soap_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
Modified: webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.in?rev=326836&r1=326835&r2=326836&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/src/Makefile.in Wed Oct 19 23:19:00 2005
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libsoap_la_SOURCES)
+SOURCES = $(libaxis2_soap_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -54,9 +54,9 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libsoap_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libsoap_la_OBJECTS =
-libsoap_la_OBJECTS = $(am_libsoap_la_OBJECTS)
+libaxis2_soap_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libaxis2_soap_la_OBJECTS =
+libaxis2_soap_la_OBJECTS = $(am_libaxis2_soap_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -66,8 +66,8 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libsoap_la_SOURCES)
-DIST_SOURCES = $(libsoap_la_SOURCES)
+SOURCES = $(libaxis2_soap_la_SOURCES)
+DIST_SOURCES = $(libaxis2_soap_la_SOURCES)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -177,11 +177,11 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-noinst_LTLIBRARIES = libsoap.la
+noinst_LTLIBRARIES = libaxis2_soap.la
AM_CPPFLAGS = $(CPPFLAGS)
-libsoap_la_SOURCES =
-libsoap_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../../include -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+libaxis2_soap_la_SOURCES =
+libaxis2_soap_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
all: all-am
.SUFFIXES:
@@ -223,8 +223,8 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libsoap.la: $(libsoap_la_OBJECTS) $(libsoap_la_DEPENDENCIES)
- $(LINK) $(libsoap_la_LDFLAGS) $(libsoap_la_OBJECTS) $(libsoap_la_LIBADD) $(LIBS)
+libaxis2_soap.la: $(libaxis2_soap_la_OBJECTS) $(libaxis2_soap_la_DEPENDENCIES)
+ $(LINK) $(libaxis2_soap_la_LDFLAGS) $(libaxis2_soap_la_OBJECTS) $(libaxis2_soap_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)