You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/10/13 13:58:12 UTC
svn commit: r320741 - in /webservices/axis2/trunk/c: ./ include/ modules/
modules/common/src/ modules/common/test/ modules/test/ modules/test/common/
modules/test/unit/ modules/util/src/ modules/util/test/ modules/xml/om/src/
Author: damitha
Date: Thu Oct 13 04:57:22 2005
New Revision: 320741
URL: http://svn.apache.org/viewcvs?rev=320741&view=rev
Log:
There was a problem in building. Corrected it
Removed:
webservices/axis2/trunk/c/modules/common/test/main.c
Modified:
webservices/axis2/trunk/c/configure
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_description_param_include.h
webservices/axis2/trunk/c/include/axis2_string.h
webservices/axis2/trunk/c/modules/Makefile.am
webservices/axis2/trunk/c/modules/Makefile.in
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/common/test/common_test.c
webservices/axis2/trunk/c/modules/common/test/common_test.h
webservices/axis2/trunk/c/modules/test/Makefile.am
webservices/axis2/trunk/c/modules/test/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/common/test_common.c
webservices/axis2/trunk/c/modules/test/unit/Makefile.am
webservices/axis2/trunk/c/modules/test/unit/Makefile.in
webservices/axis2/trunk/c/modules/util/src/Makefile.am
webservices/axis2/trunk/c/modules/util/test/Makefile.am
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in
Modified: webservices/axis2/trunk/c/configure
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure (original)
+++ webservices/axis2/trunk/c/configure Thu Oct 13 04:57:22 2005
@@ -20511,7 +20511,7 @@
#AC_CHECK_FUNCS([memmove])
- ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/xml/Makefile modules/xml/guththila/Makefile modules/xml/guththila/src/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile modules/util/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile modules/test/common/Makefile modules/test/unit/Makefile"
+ ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/xml/Makefile modules/xml/guththila/Makefile modules/xml/guththila/src/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile modules/util/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile modules/test/common/Makefile modules/test/util/Makefile modules/test/unit/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -21094,6 +21094,7 @@
"modules/test/om/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/om/Makefile" ;;
"modules/test/om/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/om/src/Makefile" ;;
"modules/test/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/common/Makefile" ;;
+ "modules/test/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/util/Makefile" ;;
"modules/test/unit/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/unit/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"axis2_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS axis2_config.h" ;;
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Oct 13 04:57:22 2005
@@ -55,4 +55,5 @@
modules/test/om/Makefile \
modules/test/om/src/Makefile \
modules/test/common/Makefile \
+ modules/test/util/Makefile \
modules/test/unit/Makefile])
Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Thu Oct 13 04:57:22 2005
@@ -20,8 +20,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <apr_hash.h>
-
#include <axis2_om_element.h>
#include <axis2_qname.h>
#include <axis2.h>
Modified: webservices/axis2/trunk/c/include/axis2_string.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_string.h?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/include/axis2_string.h Thu Oct 13 04:57:22 2005
@@ -23,7 +23,7 @@
typedef struct axis2_string
{
void* (*axis2_string_strdup)(const void *ptr);
- int (*axis2_string_strcmpa)(const axis2_char_t *s1, const axis2_char_t *s2);
+ int (*axis2_string_strcmp)(const axis2_char_t *s1, const axis2_char_t *s2);
}axis2_string_t;
/**
@@ -36,7 +36,7 @@
axis2_string_t *
axis2_string_create(axis2_allocator_t *allocator, axis2_string_t *string);
-#define axis2_strdup(string, ptr) ((string)->axis2_string_strdupa(ptr))
-#define axis2_strcmp(string, s1, s2) ((string)->axis2_string_strcmpa(s1, s2))
+#define axis2_strdup(string, ptr) ((string)->axis2_string_strdup(ptr))
+#define axis2_strcmp(string, s1, s2) ((string)->axis2_string_strcmp(s1, s2))
#endif /* AXIS2_STRING_H */
Modified: webservices/axis2/trunk/c/modules/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/Makefile.am?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1 +1 @@
-SUBDIRS = common core xml test util
+SUBDIRS = util common xml core test
Modified: webservices/axis2/trunk/c/modules/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/Makefile.in?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/Makefile.in Thu Oct 13 04:57:22 2005
@@ -152,7 +152,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = common core xml test util
+SUBDIRS = util common xml core test
all: all-recursive
.SUFFIXES:
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libcommon.la
+lib_LTLIBRARIES = libcommon.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = axis2.c axis2_allocator.c axis2_environment.c axis2_error.c axis2_stream.c axis2_log.c
+libcommon_la_SOURCES = axis2.c
libcommon_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../include -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+INCLUDES = -I../../../include -I${CUTEST_HOME}/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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.in Thu Oct 13 04:57:22 2005
@@ -47,12 +47,18 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/axis2_config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libcommon_la_OBJECTS = axis2.lo axis2_allocator.lo \
- axis2_environment.lo axis2_error.lo axis2_stream.lo \
- axis2_log.lo
+am_libcommon_la_OBJECTS = axis2.lo
libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -166,11 +172,11 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-noinst_LTLIBRARIES = libcommon.la
+lib_LTLIBRARIES = libcommon.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = axis2.c axis2_allocator.c axis2_environment.c axis2_error.c axis2_stream.c axis2_log.c
+libcommon_la_SOURCES = axis2.c
libcommon_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I../../../include -I$(APR_HOME)/include/apr-1 -I${CUTEST_HOME}/include
+INCLUDES = -I../../../include -I${CUTEST_HOME}/include
all: all-am
.SUFFIXES:
@@ -204,17 +210,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
- $(LINK) $(libcommon_la_LDFLAGS) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libcommon_la_LDFLAGS) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -223,11 +247,6 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_allocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_environment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_stream.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -339,6 +358,9 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -365,7 +387,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
@@ -386,7 +408,7 @@
install-data-am:
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
@@ -412,19 +434,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-info-am
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1,7 +1,11 @@
-bin_PROGRAMS = common_test
-SUBDIRS =
+lib_LTLIBRARIES = libtest_common.la
AM_CPPFLAGS = $(CPPFLAGS)
-common_test_SOURCES = common_test.c main.c
+libtest_common_la_SOURCES = common_test.c
+
+libtest_common_la_LIBADD = $(LDFLAGS) ../src/libcommon.la -ldl
+INCLUDES = -I../../../include -I${CUTEST_HOME}/include
+
+bin_PROGRAMS = common_test
+common_test_SOURCES = main.c
+common_test_LDADD = $(LDFLAGS) libtest_common.la ../src/libcommon.la -ldl
-common_test_LDADD = $(LDFLAGS) ../src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/test/Makefile.in Thu Oct 13 04:57:22 2005
@@ -14,7 +14,8 @@
@SET_MAKE@
-SOURCES = $(common_test_SOURCES)
+
+SOURCES = $(libtest_common_la_SOURCES) $(common_test_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -48,13 +49,26 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/axis2_config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libtest_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ ../src/libcommon.la
+am_libtest_common_la_OBJECTS = common_test.lo
+libtest_common_la_OBJECTS = $(am_libtest_common_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_common_test_OBJECTS = common_test.$(OBJEXT) main.$(OBJEXT)
+am_common_test_OBJECTS = main.$(OBJEXT)
common_test_OBJECTS = $(am_common_test_OBJECTS)
-am__DEPENDENCIES_1 =
-common_test_DEPENDENCIES = $(am__DEPENDENCIES_1) ../src/libcommon.la
+common_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_common.la \
+ ../src/libcommon.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -66,17 +80,10 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(common_test_SOURCES)
-DIST_SOURCES = $(common_test_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+SOURCES = $(libtest_common_la_SOURCES) $(common_test_SOURCES)
+DIST_SOURCES = $(libtest_common_la_SOURCES) $(common_test_SOURCES)
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -174,12 +181,14 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS =
+lib_LTLIBRARIES = libtest_common.la
AM_CPPFLAGS = $(CPPFLAGS)
-common_test_SOURCES = common_test.c main.c
-common_test_LDADD = $(LDFLAGS) ../src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
-all: all-recursive
+libtest_common_la_SOURCES = common_test.c
+libtest_common_la_LIBADD = $(LDFLAGS) ../src/libcommon.la -ldl
+INCLUDES = -I../../../include -I${CUTEST_HOME}/include
+common_test_SOURCES = main.c
+common_test_LDADD = $(LDFLAGS) libtest_common.la ../src/libcommon.la -ldl
+all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -212,6 +221,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libtest_common.la: $(libtest_common_la_OBJECTS) $(libtest_common_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libtest_common_la_LDFLAGS) $(libtest_common_la_OBJECTS) $(libtest_common_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -250,7 +288,7 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_test.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
.c.o:
@@ -284,77 +322,6 @@
-rm -f libtool
uninstall-info-am:
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -365,23 +332,10 @@
mkid -fID $$unique
tags: TAGS
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -394,7 +348,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -443,38 +397,24 @@
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
- done
check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
- for dir in "$(DESTDIR)$(bindir)"; do \
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -490,72 +430,71 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool mostlyclean-am
-distclean: distclean-recursive
+distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
-dvi: dvi-recursive
+dvi: dvi-am
dvi-am:
-html: html-recursive
+html: html-am
-info: info-recursive
+info: info-am
info-am:
install-data-am:
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-install-info: install-info-recursive
+install-info: install-info-am
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-recursive
+pdf: pdf-am
pdf-am:
-ps: ps-recursive
+ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-libLTLIBRARIES
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-binPROGRAMS clean-generic clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: webservices/axis2/trunk/c/modules/common/test/common_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/common_test.c?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/common_test.c (original)
+++ webservices/axis2/trunk/c/modules/common/test/common_test.c Thu Oct 13 04:57:22 2005
@@ -1,47 +1,9 @@
-#include <CuTest.h>
-#include <string.h>
-#include <stdio.h>
-#include <axis2_allocator.h>
-#include <axis2_environment.h>
-
-void Testaxis2_stream_ops_read(CuTest *tc) {
-
- char actual[10];
- axis2_allocator_t *allocator = axis2_allocator_init(NULL);
- axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
- axis2_stream_read(env->stream, actual, 10);
- char *expected = strdup("aaaaaaaaa");
- CuAssertStrEquals(tc, expected, actual);
-}
-
-void Testaxis2_stream_ops_write(CuTest *tc) {
-
- char actual[10];
- axis2_allocator_t *allocator = axis2_allocator_init(NULL);
- axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
- axis2_stream_read(env->stream, actual, 10);
- axis2_stream_write(env->stream, actual, 10);
- char *expected = strdup("aaaaaaaaa");
- CuAssertStrEquals(tc, expected, actual);
-}
-
-void Testaxis2_log_ops_write(CuTest *tc) {
-
- char actual[10];
- axis2_allocator_t *allocator = axis2_allocator_init(NULL);
- axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
- axis2_stream_read(env->stream, actual, 10);
- axis2_log_write(env->log, actual, 10);
- char *expected = strdup("aaaaaaaaa");
- CuAssertStrEquals(tc, expected, actual);
-}
+#include "common_test.h"
CuSuite* axis2_commonGetSuite() {
CuSuite* suite = CuSuiteNew();
- SUITE_ADD_TEST(suite, Testaxis2_stream_ops_read);
- SUITE_ADD_TEST(suite, Testaxis2_stream_ops_write);
- SUITE_ADD_TEST(suite, Testaxis2_log_ops_write);
+ /*SUITE_ADD_TEST(suite, Testaxis2_stream_ops_read);*/
+ /*SUITE_ADD_TEST(suite, Testaxis2_stream_ops_write);*/
return suite;
}
-
Modified: webservices/axis2/trunk/c/modules/common/test/common_test.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/common_test.h?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/common_test.h (original)
+++ webservices/axis2/trunk/c/modules/common/test/common_test.h Thu Oct 13 04:57:22 2005
@@ -2,6 +2,10 @@
#define COMMON_TEST_H
#include <CuTest.h>
+#include <string.h>
+#include <stdio.h>
+#include <axis2_allocator.h>
+#include <axis2_environment.h>
CuSuite* axis2_commonGetSuite();
Modified: webservices/axis2/trunk/c/modules/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/Makefile.am?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1 +1 @@
-SUBDIRS = om common unit
+SUBDIRS = util common om unit
Modified: webservices/axis2/trunk/c/modules/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/Makefile.in?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/Makefile.in Thu Oct 13 04:57:22 2005
@@ -152,7 +152,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = om common unit
+SUBDIRS = util common om unit
all: all-recursive
.SUFFIXES:
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.am Thu Oct 13 04:57:22 2005
@@ -4,4 +4,4 @@
test_common_SOURCES = test_common.c
test_common_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
+INCLUDES = -I${CUTEST_HOME}/include -I../../../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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/common/Makefile.in Thu Oct 13 04:57:22 2005
@@ -179,7 +179,7 @@
AM_CPPFLAGS = $(CPPFLAGS)
test_common_SOURCES = test_common.c
test_common_LDADD = $(LDFLAGS) ../../common/src/libcommon.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
+INCLUDES = -I${CUTEST_HOME}/include -I../../../include
all: all-recursive
.SUFFIXES:
Modified: webservices/axis2/trunk/c/modules/test/common/test_common.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/common/test_common.c?rev=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/common/test_common.c (original)
+++ webservices/axis2/trunk/c/modules/test/common/test_common.c Thu Oct 13 04:57:22 2005
@@ -3,11 +3,4 @@
int main()
{
- char buff[10];
- axis2_allocator_t *allocator = axis2_allocator_init(NULL);
- axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
- axis2_stream_read(env->stream, buff, 10);
- axis2_stream_write(env->stream, buff, 10);
- axis2_log_write(env->log, buff, 10);
- return 0;
}
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.am Thu Oct 13 04:57:22 2005
@@ -4,4 +4,4 @@
unit_test_SOURCES = main.c
unit_test_LDADD = $(LDFLAGS) ../../common/test/libcommon_test.la ../../util/test/libutil_test.la ../../common/src/libcommon.la ../../util/src/libutil.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
+INCLUDES = -I${CUTEST_HOME}/include -I../../../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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/unit/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/unit/Makefile.in Thu Oct 13 04:57:22 2005
@@ -181,7 +181,7 @@
AM_CPPFLAGS = $(CPPFLAGS)
unit_test_SOURCES = main.c
unit_test_LDADD = $(LDFLAGS) ../../common/test/libcommon_test.la ../../util/test/libutil_test.la ../../common/src/libcommon.la ../../util/src/libutil.la -ldl
-INCLUDES = -I${CUTEST_HOME}/include -I${APR_HOME}/include/apr-1 -I../../../include
+INCLUDES = -I${CUTEST_HOME}/include -I../../../include
all: all-recursive
.SUFFIXES:
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libutil.la
+lib_LTLIBRARIES = libutil.la
AM_CPPFLAGS = $(CPPFLAGS)
-libutil_la_SOURCES = axis2_hash.c
+libutil_la_SOURCES = axis2_hash.c axis2_allocator.c axis2_environment.c axis2_error.c axis2_stream.c axis2_log.c
libutil_la_LIBADD = $(LDFLAGS)
INCLUDES = -I../../../include -I${CUTEST_HOME}/include
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/test/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1,12 +1,11 @@
-bin_PROGRAMS = util_test
-SUBDIRS =
+lib_LTLIBRARIES = libtest_util.la
AM_CPPFLAGS = $(CPPFLAGS)
-util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libutil_test.la ../src/libutil.la ../../common/src/libcommon.la
+libtest_util_la_SOURCES = util_hash_test.c util_stream_test.c util_log_test.c util_error_test.c util_test.c
+libtest_util_la_LIBADD = $(LDFLAGS) ../src/libutil.la -ldl
+INCLUDES = -I../../../include -I${CUTEST_HOME}/include
-noinst_LTLIBRARIES = libutil_test.la
-libutil_test_la_SOURCES = util_stream_test.c util_log_test.c util_error_test.c util_hash_test.c util_test.c
-libutil_test_LIBADD = $(LDFLAGS) ../src/libutil.la ../../common/src/libcommon.la
-INCLUDES = -I${CUTEST_HOME}/include -I../../../include
+bin_PROGRAMS = util_test
+util_test_SOURCES = main.c
+util_test_LDADD = $(LDFLAGS) libtest_util.la ../src/libutil.la -ldl
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am Thu Oct 13 04:57:22 2005
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libom.la
+lib_LTLIBRARIES = libom.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_stax_ombuilder.c
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=320741&r1=320740&r2=320741&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in Thu Oct 13 04:57:22 2005
@@ -47,7 +47,15 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/axis2_config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+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 \
@@ -168,7 +176,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-noinst_LTLIBRARIES = libom.la
+lib_LTLIBRARIES = libom.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_stax_ombuilder.c
libom_la_LIBADD = $(LDFLAGS)
@@ -206,17 +214,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libom.la: $(libom_la_OBJECTS) $(libom_la_DEPENDENCIES)
- $(LINK) $(libom_la_LDFLAGS) $(libom_la_OBJECTS) $(libom_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libom_la_LDFLAGS) $(libom_la_OBJECTS) $(libom_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -347,6 +373,9 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -373,7 +402,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
@@ -394,7 +423,7 @@
install-data-am:
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
@@ -420,19 +449,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-info-am
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.