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:29:20 UTC
svn commit: r502661 - in /xerces/c/trunk: obj/Makefile.am
samples/Makefile.am tests/Makefile.am
Author: amassari
Date: Fri Feb 2 09:29:17 2007
New Revision: 502661
URL: http://svn.apache.org/viewvc?view=rev&rev=502661
Log:
Use top_builddir in makefiles, so that out-of-tree builds work
Modified:
xerces/c/trunk/obj/Makefile.am
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/tests/Makefile.am
Modified: xerces/c/trunk/obj/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/obj/Makefile.am?view=diff&rev=502661&r1=502660&r2=502661
==============================================================================
--- xerces/c/trunk/obj/Makefile.am (original)
+++ xerces/c/trunk/obj/Makefile.am Fri Feb 2 09:29:17 2007
@@ -21,17 +21,14 @@
include ../version.incl
-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}
if XERCES_USE_MSGLOADER_ICU
-libxerces_la_LDFLAGS += -L${top_srcdir}/obj/.libs -lXercesMessages$(VER)
+libxerces_la_LDFLAGS += -L${top_builddir}/obj/.libs -lXercesMessages$(VER)
endif
Modified: xerces/c/trunk/samples/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?view=diff&rev=502661&r1=502660&r2=502661
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Fri Feb 2 09:29:17 2007
@@ -21,8 +21,10 @@
bin_PROGRAMS = ${sampleprogs}
-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 =
Modified: xerces/c/trunk/tests/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.am?view=diff&rev=502661&r1=502660&r2=502661
==============================================================================
--- xerces/c/trunk/tests/Makefile.am (original)
+++ xerces/c/trunk/tests/Makefile.am Fri Feb 2 09:29:17 2007
@@ -21,8 +21,10 @@
check_PROGRAMS = ${testprogs}
-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
testprogs =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org