From dee85af2243e112c8efc27d3efb4496d33406199 Mon Sep 17 00:00:00 2001 From: jez <> Date: Sun, 4 May 2008 14:42:09 +0000 Subject: [PATCH] fixes to help out-of-tree builds --- examples/DOM/Makefile.am | 2 +- examples/SAX/Makefile.am | 2 +- examples/Taggle/Makefile.am | 2 +- examples/Utils/Makefile.am | 2 +- examples/XPath/Makefile.am | 2 +- examples/XSLT/Makefile.am | 2 +- src/Makefile.am | 2 +- tests/CppUnit/Makefile.am | 2 +- tests/DOM/Makefile.am | 2 +- tests/SAX/Makefile.am | 2 +- tests/Utils/Makefile.am | 3 ++- tests/XPath/Makefile.am | 2 +- tests/XSLT/Makefile.am | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/DOM/Makefile.am b/examples/DOM/Makefile.am index 3be5c10c..2fcb6596 100755 --- a/examples/DOM/Makefile.am +++ b/examples/DOM/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = domwriter dom2pyx -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la domwriter_SOURCES = DOMWriter.cpp diff --git a/examples/SAX/Makefile.am b/examples/SAX/Makefile.am index 8236ce78..f59cd0b3 100755 --- a/examples/SAX/Makefile.am +++ b/examples/SAX/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = pyx simple_handler writer xmlbase -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la pyx_SOURCES = pyx.cpp diff --git a/examples/Taggle/Makefile.am b/examples/Taggle/Makefile.am index d5d1d007..c891b94e 100755 --- a/examples/Taggle/Makefile.am +++ b/examples/Taggle/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = taggle -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la taggle_SOURCES = taggle.cpp diff --git a/examples/Utils/Makefile.am b/examples/Utils/Makefile.am index 747538ab..fddd59d4 100755 --- a/examples/Utils/Makefile.am +++ b/examples/Utils/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = transcode -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la transcode_SOURCES = transcode.cpp diff --git a/examples/XPath/Makefile.am b/examples/XPath/Makefile.am index 4311bdd7..c16d382a 100755 --- a/examples/XPath/Makefile.am +++ b/examples/XPath/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = xgrep -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ LIBARABICA = $(top_builddir)/src/libarabica.la xgrep_SOURCES = xgrep.cpp diff --git a/examples/XSLT/Makefile.am b/examples/XSLT/Makefile.am index 0026edfa..9020bdb1 100755 --- a/examples/XSLT/Makefile.am +++ b/examples/XSLT/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = mangle -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ LIBARABICA = $(top_builddir)/src/libarabica.la mangle_SOURCES = mangle.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 84947f39..c8184a5d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ cc_sources = arabica.cpp \ io/uri.cpp \ XML/XMLCharacterClasses.cpp -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) lib_LTLIBRARIES = libarabica.la libarabica_la_SOURCES= $(cc_sources) diff --git a/tests/CppUnit/Makefile.am b/tests/CppUnit/Makefile.am index 9c575634..9b2649dd 100644 --- a/tests/CppUnit/Makefile.am +++ b/tests/CppUnit/Makefile.am @@ -25,7 +25,7 @@ check_LTLIBRARIES = libcppunit.la libsillystring.la libcppunit_la_SOURCES= $(cppunit_sources) libsillystring_la_SOURCES = $(silly_string_sources) -libsillystring_la_CPPFLAGS = -I$(top_srcdir)/include +libsillystring_la_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include diff --git a/tests/DOM/Makefile.am b/tests/DOM/Makefile.am index 24fef38d..1588da1c 100644 --- a/tests/DOM/Makefile.am +++ b/tests/DOM/Makefile.am @@ -5,7 +5,7 @@ if HAS_STD_WSTRING endif TESTS = $(check_PROGRAMS) -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la LIBSILLY = ../CppUnit/libsillystring.la TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la diff --git a/tests/SAX/Makefile.am b/tests/SAX/Makefile.am index 59dc09d2..ce633acb 100755 --- a/tests/SAX/Makefile.am +++ b/tests/SAX/Makefile.am @@ -5,7 +5,7 @@ if HAS_STD_WSTRING endif TESTS = $(check_PROGRAMS) -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la LIBSILLY = ../CppUnit/libsillystring.la TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la diff --git a/tests/Utils/Makefile.am b/tests/Utils/Makefile.am index 52bd63c5..cc8506b6 100755 --- a/tests/Utils/Makefile.am +++ b/tests/Utils/Makefile.am @@ -5,13 +5,14 @@ if HAS_STD_WSTRING endif TESTS = $(check_PROGRAMS) -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ $(BOOST_CPPFLAGS) LIBARABICA = $(top_builddir)/src/libarabica.la LIBSILLY = ../CppUnit/libsillystring.la TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la test_sources = util_test_suite.hpp \ test_normalize_whitespace.hpp \ + test_xml_strings.hpp \ test_base64.hpp \ test_uri.hpp diff --git a/tests/XPath/Makefile.am b/tests/XPath/Makefile.am index 803a3f0b..977fcbca 100755 --- a/tests/XPath/Makefile.am +++ b/tests/XPath/Makefile.am @@ -5,7 +5,7 @@ if HAS_STD_WSTRING endif TESTS = $(check_PROGRAMS) -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ LIBARABICA = $(top_builddir)/src/libarabica.la LIBSILLY = ../CppUnit/libsillystring.la TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la diff --git a/tests/XSLT/Makefile.am b/tests/XSLT/Makefile.am index 0a5307ba..bdba34c0 100755 --- a/tests/XSLT/Makefile.am +++ b/tests/XSLT/Makefile.am @@ -5,7 +5,7 @@ TESTS = $(check_PROGRAMS) ELEPHANT_INCLUDE = @ELEPHANT_INCLUDES@ LIBELEPHANT = @ELEPHANT_LIBS@ -AM_CPPFLAGS = -I$(top_srcdir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ $(ELEPHANT_INCLUDE) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PARSER_HEADERS@ @BOOST_CPPFLAGS@ $(ELEPHANT_INCLUDE) LIBARABICA = $(top_builddir)/src/libarabica.la LIBSILLY = ../CppUnit/libsillystring.la TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la