You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/02/02 18:30:33 UTC
svn commit: r502663 - in /xerces/c/trunk: obj/Makefile.in
samples/Makefile.in tests/Makefile.in
Author: amassari
Date: Fri Feb 2 09:30:32 2007
New Revision: 502663
URL: http://svn.apache.org/viewvc?view=rev&rev=502663
Log:
Regenerate
Modified:
xerces/c/trunk/obj/Makefile.in
xerces/c/trunk/samples/Makefile.in
xerces/c/trunk/tests/Makefile.in
Modified: xerces/c/trunk/obj/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/trunk/obj/Makefile.in?view=diff&rev=502663&r1=502662&r2=502663
==============================================================================
--- xerces/c/trunk/obj/Makefile.in (original)
+++ xerces/c/trunk/obj/Makefile.in Fri Feb 2 09:30:32 2007
@@ -60,7 +60,7 @@
LIBOBJDIR = ../lib/
DIST_COMMON = $(srcdir)/../version.incl $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
-@XERCES_USE_MSGLOADER_ICU_TRUE@am__append_1 = -L${top_srcdir}/obj/.libs -lXercesMessages$(VER)
+@XERCES_USE_MSGLOADER_ICU_TRUE@am__append_1 = -L${top_builddir}/obj/.libs -lXercesMessages$(VER)
subdir = obj
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
@@ -99,7 +99,8 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libxerces_la_DEPENDENCIES = ${src}/libsrc.la ${lib}/libcompat.la
+libxerces_la_DEPENDENCIES = ${top_builddir}/src/libsrc.la \
+ ${top_builddir}/lib/libcompat.la
am_libxerces_la_OBJECTS =
libxerces_la_OBJECTS = $(am_libxerces_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/xercesc/util
@@ -303,12 +304,10 @@
VER = 3_0_0
VER_DOTTED = 3.0
WIN_MSG_VER = 3_0
-src = ${top_srcdir}/src
-lib = ${top_srcdir}/lib
lib_LTLIBRARIES = libxerces.la
libxerces_la_SOURCES =
nodist_EXTRA_libxerces_la_SOURCES = dummyfile-to-force-cpp-linking.cpp
-libxerces_la_LIBADD = ${src}/libsrc.la ${lib}/libcompat.la
+libxerces_la_LIBADD = ${top_builddir}/src/libsrc.la ${top_builddir}/lib/libcompat.la
libxerces_la_LDFLAGS = -release ${PACKAGE_VERSION} $(am__append_1)
all: all-am
Modified: xerces/c/trunk/samples/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.in?view=diff&rev=502663&r1=502662&r2=502663
==============================================================================
--- xerces/c/trunk/samples/Makefile.in (original)
+++ xerces/c/trunk/samples/Makefile.in Fri Feb 2 09:30:32 2007
@@ -103,76 +103,76 @@
src/CreateDOMDocument/CreateDOMDocument.$(OBJEXT)
CreateDOMDocument_OBJECTS = $(am_CreateDOMDocument_OBJECTS)
CreateDOMDocument_LDADD = $(LDADD)
-CreateDOMDocument_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+CreateDOMDocument_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_DOMCount_OBJECTS = src/DOMCount/DOMCount.$(OBJEXT)
DOMCount_OBJECTS = $(am_DOMCount_OBJECTS)
DOMCount_LDADD = $(LDADD)
-DOMCount_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+DOMCount_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_DOMPrint_OBJECTS = src/DOMPrint/DOMPrint.$(OBJEXT) \
src/DOMPrint/DOMPrintErrorHandler.$(OBJEXT) \
src/DOMPrint/DOMPrintFilter.$(OBJEXT) \
src/DOMPrint/DOMTreeErrorReporter.$(OBJEXT)
DOMPrint_OBJECTS = $(am_DOMPrint_OBJECTS)
DOMPrint_LDADD = $(LDADD)
-DOMPrint_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+DOMPrint_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_EnumVal_OBJECTS = src/EnumVal/EnumVal.$(OBJEXT)
EnumVal_OBJECTS = $(am_EnumVal_OBJECTS)
EnumVal_LDADD = $(LDADD)
-EnumVal_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+EnumVal_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_MemParse_OBJECTS = src/MemParse/MemParse.$(OBJEXT) \
src/MemParse/MemParseHandlers.$(OBJEXT)
MemParse_OBJECTS = $(am_MemParse_OBJECTS)
MemParse_LDADD = $(LDADD)
-MemParse_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+MemParse_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_PParse_OBJECTS = src/PParse/PParse.$(OBJEXT) \
src/PParse/PParseHandlers.$(OBJEXT)
PParse_OBJECTS = $(am_PParse_OBJECTS)
PParse_LDADD = $(LDADD)
-PParse_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+PParse_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_PSVIWriter_OBJECTS = src/PSVIWriter/PSVIWriter.$(OBJEXT) \
src/PSVIWriter/PSVIWriterHandlers.$(OBJEXT)
PSVIWriter_OBJECTS = $(am_PSVIWriter_OBJECTS)
PSVIWriter_LDADD = $(LDADD)
-PSVIWriter_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+PSVIWriter_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_Redirect_OBJECTS = src/Redirect/Redirect.$(OBJEXT) \
src/Redirect/RedirectHandlers.$(OBJEXT)
Redirect_OBJECTS = $(am_Redirect_OBJECTS)
Redirect_LDADD = $(LDADD)
-Redirect_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+Redirect_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SAX2Count_OBJECTS = src/SAX2Count/SAX2Count.$(OBJEXT) \
src/SAX2Count/SAX2CountHandlers.$(OBJEXT)
SAX2Count_OBJECTS = $(am_SAX2Count_OBJECTS)
SAX2Count_LDADD = $(LDADD)
-SAX2Count_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SAX2Count_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SAX2Print_OBJECTS = src/SAX2Print/SAX2FilterHandlers.$(OBJEXT) \
src/SAX2Print/SAX2Print.$(OBJEXT) \
src/SAX2Print/SAX2PrintHandlers.$(OBJEXT)
SAX2Print_OBJECTS = $(am_SAX2Print_OBJECTS)
SAX2Print_LDADD = $(LDADD)
-SAX2Print_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SAX2Print_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SAXCount_OBJECTS = src/SAXCount/SAXCount.$(OBJEXT) \
src/SAXCount/SAXCountHandlers.$(OBJEXT)
SAXCount_OBJECTS = $(am_SAXCount_OBJECTS)
SAXCount_LDADD = $(LDADD)
-SAXCount_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SAXCount_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SAXPrint_OBJECTS = src/SAXPrint/SAXPrint.$(OBJEXT) \
src/SAXPrint/SAXPrintHandlers.$(OBJEXT)
SAXPrint_OBJECTS = $(am_SAXPrint_OBJECTS)
SAXPrint_LDADD = $(LDADD)
-SAXPrint_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SAXPrint_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SCMPrint_OBJECTS = src/SCMPrint/SCMPrint.$(OBJEXT)
SCMPrint_OBJECTS = $(am_SCMPrint_OBJECTS)
SCMPrint_LDADD = $(LDADD)
-SCMPrint_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SCMPrint_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_SEnumVal_OBJECTS = src/SEnumVal/SEnumVal.$(OBJEXT)
SEnumVal_OBJECTS = $(am_SEnumVal_OBJECTS)
SEnumVal_LDADD = $(LDADD)
-SEnumVal_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+SEnumVal_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_StdInParse_OBJECTS = src/StdInParse/StdInParse.$(OBJEXT) \
src/StdInParse/StdInParseHandlers.$(OBJEXT)
StdInParse_OBJECTS = $(am_StdInParse_OBJECTS)
StdInParse_LDADD = $(LDADD)
-StdInParse_DEPENDENCIES = ${top_srcdir}/obj/libxerces.la
+StdInParse_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/xercesc/util
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -356,8 +356,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-LDADD = ${top_srcdir}/obj/libxerces.la
-AM_CPPFLAGS = -I${top_srcdir}/src
+LDADD = ${top_builddir}/obj/libxerces.la
+# the -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp
+# header file when doing out-of-tree builds
+AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
sampleprogs = CreateDOMDocument DOMCount DOMPrint EnumVal MemParse \
PParse PSVIWriter Redirect SAX2Count SAX2Print SAXCount \
SAXPrint SCMPrint SEnumVal StdInParse
Modified: xerces/c/trunk/tests/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.in?view=diff&rev=502663&r1=502662&r2=502663
==============================================================================
--- xerces/c/trunk/tests/Makefile.in (original)
+++ xerces/c/trunk/tests/Makefile.in Fri Feb 2 09:30:32 2007
@@ -99,60 +99,60 @@
am_DOMMemTest_OBJECTS = src/DOM/DOMMemTest/DOMMemTest.$(OBJEXT)
DOMMemTest_OBJECTS = $(am_DOMMemTest_OBJECTS)
DOMMemTest_LDADD = $(LDADD)
-DOMMemTest_DEPENDENCIES = ../obj/libxerces.la
+DOMMemTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_DOMTest_OBJECTS = src/DOM/DOMTest/DTest.$(OBJEXT)
DOMTest_OBJECTS = $(am_DOMTest_OBJECTS)
DOMTest_LDADD = $(LDADD)
-DOMTest_DEPENDENCIES = ../obj/libxerces.la
+DOMTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_DOMTraversalTest_OBJECTS = src/DOM/Traversal/Traversal.$(OBJEXT)
DOMTraversalTest_OBJECTS = $(am_DOMTraversalTest_OBJECTS)
DOMTraversalTest_LDADD = $(LDADD)
-DOMTraversalTest_DEPENDENCIES = ../obj/libxerces.la
+DOMTraversalTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_DOMTypeInfoTest_OBJECTS = src/DOM/TypeInfo/TypeInfo.$(OBJEXT)
DOMTypeInfoTest_OBJECTS = $(am_DOMTypeInfoTest_OBJECTS)
DOMTypeInfoTest_LDADD = $(LDADD)
-DOMTypeInfoTest_DEPENDENCIES = ../obj/libxerces.la
+DOMTypeInfoTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_EncodingTest_OBJECTS = src/EncodingTest/EncodingTest.$(OBJEXT)
EncodingTest_OBJECTS = $(am_EncodingTest_OBJECTS)
EncodingTest_LDADD = $(LDADD)
-EncodingTest_DEPENDENCIES = ../obj/libxerces.la
+EncodingTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_InitTermTest_OBJECTS = src/InitTermTest/InitTermTest.$(OBJEXT)
InitTermTest_OBJECTS = $(am_InitTermTest_OBJECTS)
InitTermTest_LDADD = $(LDADD)
-InitTermTest_DEPENDENCIES = ../obj/libxerces.la
+InitTermTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_MemHandlerTest_OBJECTS = \
src/MemHandlerTest/MemoryMonitor.$(OBJEXT) \
src/MemHandlerTest/SimpleHashPtr.$(OBJEXT)
MemHandlerTest_OBJECTS = $(am_MemHandlerTest_OBJECTS)
MemHandlerTest_LDADD = $(LDADD)
-MemHandlerTest_DEPENDENCIES = ../obj/libxerces.la
+MemHandlerTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_NetAccessorTest_OBJECTS = \
src/NetAccessorTest/NetAccessorTest.$(OBJEXT)
NetAccessorTest_OBJECTS = $(am_NetAccessorTest_OBJECTS)
NetAccessorTest_LDADD = $(LDADD)
-NetAccessorTest_DEPENDENCIES = ../obj/libxerces.la
+NetAccessorTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_Normalizer_OBJECTS = src/DOM/Normalizer/Normalizer.$(OBJEXT)
Normalizer_OBJECTS = $(am_Normalizer_OBJECTS)
Normalizer_LDADD = $(LDADD)
-Normalizer_DEPENDENCIES = ../obj/libxerces.la
+Normalizer_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_RangeTest_OBJECTS = src/DOM/RangeTest/RangeTest.$(OBJEXT)
RangeTest_OBJECTS = $(am_RangeTest_OBJECTS)
RangeTest_LDADD = $(LDADD)
-RangeTest_DEPENDENCIES = ../obj/libxerces.la
+RangeTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_ThreadTest_OBJECTS = src/ThreadTest/ThreadTest.$(OBJEXT)
ThreadTest_OBJECTS = $(am_ThreadTest_OBJECTS)
ThreadTest_LDADD = $(LDADD)
-ThreadTest_DEPENDENCIES = ../obj/libxerces.la
+ThreadTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_XSValueTest_OBJECTS = src/XSValueTest/XSValueTest.$(OBJEXT)
XSValueTest_OBJECTS = $(am_XSValueTest_OBJECTS)
XSValueTest_LDADD = $(LDADD)
-XSValueTest_DEPENDENCIES = ../obj/libxerces.la
+XSValueTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
am_XSerializerTest_OBJECTS = \
src/XSerializerTest/XSerializerHandlers.$(OBJEXT) \
src/XSerializerTest/XSerializerTest.$(OBJEXT)
XSerializerTest_OBJECTS = $(am_XSerializerTest_OBJECTS)
XSerializerTest_LDADD = $(LDADD)
-XSerializerTest_DEPENDENCIES = ../obj/libxerces.la
+XSerializerTest_DEPENDENCIES = ${top_builddir}/obj/libxerces.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/xercesc/util
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -346,8 +346,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-LDADD = ../obj/libxerces.la
-AM_CPPFLAGS = -I${top_srcdir}/src
+LDADD = ${top_builddir}/obj/libxerces.la
+# the -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp
+# header file when doing out-of-tree builds
+AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
# Doesn't compile under gcc4 for some reason
# dcargill says this is obsolete and we can delete it.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org