[libxml++] Fix the build with the changed linker behaviour on Ubuntu Natty.



commit 18bc51554901eb38e86b70fdb8be290f8eedfa6f
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Feb 24 14:22:32 2011 +0100

    Fix the build with the changed linker behaviour on Ubuntu Natty.
    
    * Makefile.am: Link the examples to glibmm explicitly.

 ChangeLog   |    6 ++++++
 Makefile.am |   31 +++++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 181a5cd..5daa834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-24  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the changed linker behaviour on Ubuntu Natty.
+
+	* Makefile.am: Link the examples to glibmm explicitly.
+
 2.33.2:
 
 2011-02-11  Murray Cumming  <murrayc murrayc com>
diff --git a/Makefile.am b/Makefile.am
index 218faeb..2e6a435 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,7 @@ library_parsers_include_HEADERS = $(h_parsers_sources_public)
 library_validators_include_HEADERS = $(h_validators_sources_public)
 
 if ENABLE_EXAMPLES
+
 examples_dom_build_dom_build_SOURCES = examples/dom_build/main.cc
 examples_dom_parse_entities_dom_parse_entities_SOURCES = \
 	examples/dom_parse_entities/main.cc
@@ -149,34 +150,36 @@ examples_schemavalidation_schemavalidation_SOURCES = \
 	examples/schemavalidation/main.cc
 examples_textreader_textreader_SOURCES = examples/textreader/main.cc
 
+examples_ldadd = libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
 examples_dom_build_dom_build_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dom_parse_entities_dom_parse_entities_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dom_parser_dom_parser_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dom_parser_raw_dom_parser_raw_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dom_read_write_dom_read_write_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dom_xpath_dom_xpath_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_dtdvalidation_dtdvalidation_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_import_node_import_node_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_sax_exception_sax_exception_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_sax_parser_sax_parser_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_sax_parser_entities_sax_parser_entities_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_schemavalidation_schemavalidation_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 examples_textreader_textreader_LDADD = \
-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+	$(examples_ldadd)
 endif # ENABLE_EXAMPLES
 
 docs/manual/libxml++.xml: docs/manual/libxml++_without_code.xml docs/manual/insert_example_code.pl



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]