packages: libkml/libkml-link.patch (NEW), libkml/libkml-sh.patch (NEW), lib...
qboosh
qboosh at pld-linux.org
Thu Jan 19 17:42:25 CET 2012
Author: qboosh Date: Thu Jan 19 16:42:25 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- new
- sh patch to hack out relying on bash extension
- link patch to fix internal linking
- system-libs to use system boost, gtest, uriparser;
included minizip is non-trivially modified, so rename it to libkmlminizip
not to conflict with original minizip
---- Files affected:
packages/libkml:
libkml-link.patch (NONE -> 1.1) (NEW), libkml-sh.patch (NONE -> 1.1) (NEW), libkml-system-libs.patch (NONE -> 1.1) (NEW), libkml.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libkml/libkml-link.patch
diff -u /dev/null packages/libkml/libkml-link.patch:1.1
--- /dev/null Thu Jan 19 17:42:25 2012
+++ packages/libkml/libkml-link.patch Thu Jan 19 17:42:20 2012
@@ -0,0 +1,119 @@
+--- libkml-1.2.0/src/kml/dom/Makefile.am.orig 2012-01-18 17:36:46.875861374 +0100
++++ libkml-1.2.0/src/kml/dom/Makefile.am 2012-01-18 18:40:03.842655177 +0100
+@@ -6,6 +6,7 @@
+ endif
+
+ lib_LTLIBRARIES = libkmldom.la
++libkmldom_la_LIBADD = $(top_builddir)/src/kml/base/libkmlbase.la -lexpat
+ libkmldom_la_SOURCES = \
+ abstractlatlonbox.cc \
+ abstractview.cc \
+--- libkml-1.2.0/src/kml/engine/Makefile.am.orig 2012-01-18 20:05:05.902826013 +0100
++++ libkml-1.2.0/src/kml/engine/Makefile.am 2012-01-18 20:05:32.092826890 +0100
+@@ -36,6 +36,7 @@
+ update.cc
+
+ libkmlengine_la_LIBADD = \
++ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la
+
+ # These header files will be installed in $(includedir)/kml/engine for use in
+--- libkml-1.2.0/src/kml/xsd/Makefile.am.orig 2012-01-18 17:36:46.885861375 +0100
++++ libkml-1.2.0/src/kml/xsd/Makefile.am 2012-01-18 18:41:50.752658758 +0100
+@@ -6,6 +6,7 @@
+ endif
+
+ lib_LTLIBRARIES = libkmlxsd.la
++libkmlxsd_la_LIBADD = $(top_builddir)/src/kml/base/libkmlbase.la
+ libkmlxsd_la_SOURCES = \
+ xsd_complex_type.cc \
+ xsd_element.cc \
+--- libkml-1.2.0/src/kml/convenience/Makefile.am.orig 2012-01-18 17:36:46.885861375 +0100
++++ libkml-1.2.0/src/kml/convenience/Makefile.am 2012-01-18 18:43:45.442662597 +0100
+@@ -11,6 +11,10 @@
+ http_client_test_util.h
+
+ lib_LTLIBRARIES = libkmlconvenience.la
++libkmlconvenience_la_LIBADD = \
++ $(top_builddir)/src/kml/engine/libkmlengine.la \
++ $(top_builddir)/src/kml/dom/libkmldom.la \
++ $(top_builddir)/src/kml/base/libkmlbase.la
+ libkmlconvenience_la_SOURCES = \
+ atom_util.cc \
+ convenience.cc \
+--- libkml-1.2.0/src/kml/regionator/Makefile.am.orig 2012-01-18 17:36:46.882528041 +0100
++++ libkml-1.2.0/src/kml/regionator/Makefile.am 2012-01-18 18:45:17.802665690 +0100
+@@ -7,6 +7,11 @@
+ endif
+
+ lib_LTLIBRARIES = libkmlregionator.la
++libkmlregionator_la_LIBADD = \
++ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
++ $(top_builddir)/src/kml/engine/libkmlengine.la \
++ $(top_builddir)/src/kml/dom/libkmldom.la \
++ $(top_builddir)/src/kml/base/libkmlbase.la
+ libkmlregionator_la_SOURCES = \
+ feature_list_region_handler.cc \
+ regionator.cc \
+--- libkml-1.2.0/src/kml/Makefile.am.orig 2009-07-23 21:05:48.000000000 +0200
++++ libkml-1.2.0/src/kml/Makefile.am 2012-01-18 18:45:48.796000062 +0100
+@@ -1,5 +1,5 @@
+ # base must be built before engine.
+-SUBDIRS = . base convenience dom engine regionator xsd
++SUBDIRS = . base dom engine convenience regionator xsd
+
+ domincludedir = $(includedir)/kml
+ dominclude_HEADERS = dom.h engine.h
+--- libkml-1.2.0/src/swig/Makefile.am.orig 2012-01-18 20:07:59.759498501 +0100
++++ libkml-1.2.0/src/swig/Makefile.am 2012-01-18 20:44:29.316238482 +0100
+@@ -26,6 +26,7 @@
+ libkmlbase_swig_java_la_SOURCES = kmlbase_java.cc
+ libkmlbase_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
+ libkmlbase_swig_java_la_LIBADD = $(COMMONLIBS)
++libkmlbase_swig_java_la_LDFLAGS = -module -avoid-version
+ kmlbase_java.cc: kmlbase.i
+ mkdir -p $(java_package_dir)
+ $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlbase_java.cc \
+@@ -35,7 +36,7 @@
+ libkmlbase_swig_python_la_SOURCES = kmlbase_python.cc kmlbase.py
+ libkmlbase_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ libkmlbase_swig_python_la_LIBADD = $(COMMONLIBS)
+-libkmlbase_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
++libkmlbase_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
+ kmlbase_python.cc: kmlbase.i
+ $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlbase_python.cc \
+ $(top_srcdir)/src/swig/kmlbase.i
+@@ -44,6 +44,7 @@
+ libkmldom_swig_java_la_SOURCES = kmldom_java.cc
+ libkmldom_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
+ libkmldom_swig_java_la_LIBADD = $(COMMONLIBS)
++libkmldom_swig_java_la_LDFLAGS = -module -avoid-version
+ kmldom_java.cc: kmldom.i
+ mkdir -p $(java_package_dir)
+ $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmldom_java.cc \
+@@ -52,7 +53,7 @@
+ libkmldom_swig_python_la_SOURCES = kmldom_python.cc kmldom.py
+ libkmldom_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ libkmldom_swig_python_la_LIBADD = $(COMMONLIBS)
+-libkmldom_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
++libkmldom_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
+ kmldom_python.cc: kmldom.i
+ $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmldom_python.cc \
+ $(top_srcdir)/src/swig/kmldom.i
+@@ -61,6 +62,7 @@
+ libkmlengine_swig_java_la_SOURCES = kmlengine_java.cc
+ libkmlengine_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
+ libkmlengine_swig_java_la_LIBADD = $(COMMONLIBS)
++libkmlengine_swig_java_la_LDFLAGS = -module -avoid-version
+ kmlengine_java.cc: kmlengine.i
+ mkdir -p $(java_package_dir)
+ $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlengine_java.cc \
+@@ -69,7 +70,7 @@
+ libkmlengine_swig_python_la_SOURCES = kmlengine_python.cc kmlengine.py
+ libkmlengine_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ libkmlengine_swig_python_la_LIBADD = $(COMMONLIBS)
+-libkmlengine_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
++libkmlengine_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
+ kmlengine_python.cc: kmlengine.i
+ $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlengine_python.cc \
+ $(top_srcdir)/src/swig/kmlengine.i
================================================================
Index: packages/libkml/libkml-sh.patch
diff -u /dev/null packages/libkml/libkml-sh.patch:1.1
--- /dev/null Thu Jan 19 17:42:25 2012
+++ packages/libkml/libkml-sh.patch Thu Jan 19 17:42:20 2012
@@ -0,0 +1,13 @@
+--- libkml-1.2.0/configure.ac.orig 2010-01-14 01:16:35.000000000 +0100
++++ libkml-1.2.0/configure.ac 2012-01-16 21:02:52.827156120 +0100
+@@ -88,10 +88,6 @@
+ AC_CHECK_PROG(SWIG, swig, swig)
+ if test "x$SWIG" != x; then
+ SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
+- if test ${SWIG_VERSION:4} -lt 35; then
+- AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
+- SWIG=
+- fi
+ fi
+ fi
+ AM_CONDITIONAL(WITH_SWIG, [test "x$SWIG" != x])
================================================================
Index: packages/libkml/libkml-system-libs.patch
diff -u /dev/null packages/libkml/libkml-system-libs.patch:1.1
--- /dev/null Thu Jan 19 17:42:25 2012
+++ packages/libkml/libkml-system-libs.patch Thu Jan 19 17:42:20 2012
@@ -0,0 +1,1228 @@
+--- libkml-1.2.0.orig/examples/engine/Makefile.am 2012-01-16 21:24:24.743866045 +0100
++++ libkml-1.2.0/examples/engine/Makefile.am 2012-01-17 16:37:35.359516135 +0100
+@@ -1,5 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/examples/gpx/Makefile.am 2012-01-16 21:24:24.737199379 +0100
++++ libkml-1.2.0/examples/gpx/Makefile.am 2012-01-17 16:36:46.049514483 +0100
+@@ -1,5 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/examples/gx/Makefile.am 2012-01-16 21:24:24.740532712 +0100
++++ libkml-1.2.0/examples/gx/Makefile.am 2012-01-17 16:37:24.139515759 +0100
+@@ -1,5 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/examples/hellonet/Makefile.am 2012-01-16 21:24:24.737199379 +0100
++++ libkml-1.2.0/examples/hellonet/Makefile.am 2012-01-17 16:36:37.422847527 +0100
+@@ -1,7 +1,6 @@
+ if HAVE_CURL
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/examples/hellonet \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++ -I$(top_srcdir)/examples/hellonet
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/examples/helloworld/Makefile.am 2012-01-16 21:24:24.740532712 +0100
++++ libkml-1.2.0/examples/helloworld/Makefile.am 2012-01-17 16:37:15.879515482 +0100
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/examples/helloworld \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++ -I$(top_srcdir)/examples/helloworld
+
+
+ if GCC
+@@ -10,7 +9,7 @@
+ noinst_LTLIBRARIES = libhelloutil.la
+
+ libhelloutil_la_SOURCES = print.cc
+-libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
++libhelloutil_la_LIBADD = $(top_builddir)/third_party/libkmlminizip.la
+
+ noinst_PROGRAMS = countkml createkml checklinks circlegen helloattrs helloenum \
+ hellofeatures hellofolder hellogeometry hellohref hellokmz \
+--- libkml-1.2.0.orig/examples/regionator/Makefile.am 2012-01-16 21:24:24.733866045 +0100
++++ libkml-1.2.0/examples/regionator/Makefile.am 2012-01-17 16:36:26.522847163 +0100
+@@ -1,6 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1 \
+- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/examples/xsd/Makefile.am 2012-01-16 21:24:24.740532712 +0100
++++ libkml-1.2.0/examples/xsd/Makefile.am 2012-01-17 16:37:00.232848292 +0100
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/examples/xsd \
+- -I$(top_srcdir)/third_party/boost_1_34_1
++ -I$(top_srcdir)/examples/xsd
+
+ if GCC
+ AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+--- libkml-1.2.0.orig/src/kml/base/Makefile.am 2012-01-16 21:24:24.750532711 +0100
++++ libkml-1.2.0/src/kml/base/Makefile.am 2012-01-17 16:27:14.232828670 +0100
+@@ -1,7 +1,4 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1 \
+- -I$(top_srcdir)/third_party/googletest-r108/include \
+- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
+ -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
+
+ if GCC
+@@ -31,8 +28,8 @@
+ zip_file.cc
+
+ libkmlbase_la_LIBADD = \
+- $(top_builddir)/third_party/libminizip.la \
+- $(top_builddir)/third_party/liburiparser.la
++ $(top_builddir)/third_party/libkmlminizip.la \
++ -luriparser
+
+ # These header files will be installed in $(includedir)/kml/base
+ libkmlbaseincludedir = $(includedir)/kml/base
+@@ -97,116 +94,93 @@
+
+ attributes_test_SOURCES = attributes_test.cc
+ attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-attributes_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++attributes_test_LDADD = libkmlbase.la -lgtest
+
+ color32_test_SOURCES = color32_test.cc
+ color32_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-color32_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++color32_test_LDADD = libkmlbase.la -lgtest
+
+ csv_splitter_test_SOURCES = csv_splitter_test.cc
+ csv_splitter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-csv_splitter_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++csv_splitter_test_LDADD = libkmlbase.la -lgtest
+
+ date_time_test_SOURCES = date_time_test.cc
+ date_time_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-date_time_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++date_time_test_LDADD = libkmlbase.la -lgtest
+
+ expat_handler_ns_test_SOURCES = expat_handler_ns_test.cc
+ expat_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-expat_handler_ns_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++expat_handler_ns_test_LDADD = libkmlbase.la -lgtest
+
+ expat_parser_test_SOURCES = expat_parser_test.cc
+ expat_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-expat_parser_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++expat_parser_test_LDADD = libkmlbase.la -lgtest
+
+ file_test_SOURCES = file_test.cc
+ file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-file_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++file_test_LDADD = libkmlbase.la -lgtest
+
+ math_util_test_SOURCES = math_util_test.cc
+ math_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-math_util_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++math_util_test_LDADD = libkmlbase.la -lgtest
+
+ net_cache_test_SOURCES = net_cache_test.cc
+ net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-net_cache_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/liburiparser.la \
+- $(top_builddir)/third_party/libgtest.la
++net_cache_test_LDADD = libkmlbase.la -luriparser -lgtest
+
+ referent_test_SOURCES = referent_test.cc
+ referent_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-referent_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++referent_test_LDADD= libkmlbase.la -lgtest
+
+ string_util_test_SOURCES = string_util_test.cc
+ string_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-string_util_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++string_util_test_LDADD= libkmlbase.la -lgtest
+
+ tempfile_test_SOURCES = tempfile_test.cc
+ tempfile_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-tempfile_test_LDADD = libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++tempfile_test_LDADD = libkmlbase.la -lgtest
+
+ time_util_test_SOURCES = time_util_test.cc
+ time_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-time_util_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++time_util_test_LDADD= libkmlbase.la -lgtest
+
+ uri_parser_test_SOURCES = uri_parser_test.cc
+ uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-uri_parser_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/liburiparser.la \
+- $(top_builddir)/third_party/libgtest.la
++uri_parser_test_LDADD= libkmlbase.la -luriparser -lgtest
+
+ util_test_SOURCES = util_test.cc
+ util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-util_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++util_test_LDADD= libkmlbase.la -lgtest
+
+ vec3_test_SOURCES = vec3_test.cc
+ vec3_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-vec3_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++vec3_test_LDADD= libkmlbase.la -lgtest
+
+ version_test_SOURCES = version_test.cc
+ version_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-version_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++version_test_LDADD= libkmlbase.la -lgtest
+
+ xml_element_test_SOURCES = xml_element_test.cc
+ xml_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-xml_element_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++xml_element_test_LDADD= libkmlbase.la -lgtest
+
+ xml_file_test_SOURCES = xml_file_test.cc
+ xml_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-xml_file_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++xml_file_test_LDADD= libkmlbase.la -lgtest
+
+ xml_namespaces_test_SOURCES = xml_namespaces_test.cc
+ xml_namespaces_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-xml_namespaces_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++xml_namespaces_test_LDADD= libkmlbase.la -lgtest
+
+ xmlns_test_SOURCES = xmlns_test.cc
+ xmlns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+-xmlns_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++xmlns_test_LDADD= libkmlbase.la -lgtest
+
+ zip_file_test_SOURCES = zip_file_test.cc
+ zip_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+ zip_file_test_LDADD= libkmlbase.la \
+- $(top_builddir)/third_party/libminizip.la \
+- $(top_builddir)/third_party/libgtest.la
++ $(top_builddir)/third_party/libkmlminizip.la \
++ -lgtest
+
+ CLEANFILES = check_PROGRAMS
+
+--- libkml-1.2.0.orig/src/kml/convenience/Makefile.am 2012-01-16 21:24:24.757199378 +0100
++++ libkml-1.2.0/src/kml/convenience/Makefile.am 2012-01-17 16:28:26.796164433 +0100
+@@ -1,6 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1 \
+- -I$(top_srcdir)/third_party/googletest-r108/include
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
+@@ -66,7 +64,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ convenience_test_SOURCES = convenience_test.cc
+ convenience_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+@@ -74,7 +72,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ csv_file_test_SOURCES = csv_file_test.cc
+ csv_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -82,7 +80,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ csv_parser_test_SOURCES = csv_parser_test.cc
+ csv_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -90,7 +88,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ element_counter_test_SOURCES = element_counter_test.cc
+ element_counter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -98,7 +96,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ feature_list_test_SOURCES = feature_list_test.cc
+ feature_list_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+@@ -106,7 +104,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ google_doc_list_test_SOURCES = google_doc_list_test.cc
+ google_doc_list_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -114,7 +112,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ google_maps_data_test_SOURCES = google_maps_data_test.cc
+ google_maps_data_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -122,7 +120,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ google_picasa_web_test_SOURCES = google_picasa_web_test.cc
+ google_picasa_web_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -130,7 +128,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ google_spreadsheets_test_SOURCES = google_spreadsheets_test.cc
+ google_spreadsheets_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -138,7 +136,7 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ gpx_trk_pt_handler_test_SOURCES = gpx_trk_pt_handler_test.cc
+ gpx_trk_pt_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -146,13 +144,13 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ http_client_test_SOURCES = http_client_test.cc
+ http_client_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ http_client_test_LDADD = http_client.o \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ kmz_check_links_test_SOURCES = kmz_check_links_test.cc
+ kmz_check_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+@@ -160,6 +158,6 @@
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ CLEANFILES = check_PROGRAMS
+--- libkml-1.2.0.orig/src/kml/dom/Makefile.am 2012-01-16 21:24:24.747199378 +0100
++++ libkml-1.2.0/src/kml/dom/Makefile.am 2012-01-17 16:33:18.899507548 +0100
+@@ -1,6 +1,4 @@
+-AM_CPPFLAGS= -I$(top_srcdir)/src \
+- -I$(top_srcdir)/third_party/boost_1_34_1 \
+- -I$(top_srcdir)/third_party/googletest-r108/include
++AM_CPPFLAGS= -I$(top_srcdir)/src
+
+ if GCC
+ AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
+@@ -180,306 +178,306 @@
+ abstractlatlonbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ abstractlatlonbox_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ abstractview_test_SOURCES = abstractview_test.cc
+ abstractview_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ abstractview_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ atom_test_SOURCES = atom_test.cc
+ atom_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ atom_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ balloonstyle_test_SOURCES = balloonstyle_test.cc
+ balloonstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ balloonstyle_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ colorstyle_test_SOURCES = colorstyle_test.cc
+ colorstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ colorstyle_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ container_test_SOURCES = container_test.cc
+ container_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ container_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ document_test_SOURCES = document_test.cc
+ document_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ document_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ element_test_SOURCES = element_test.cc
+ element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ element_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ extendeddata_test_SOURCES = extendeddata_test.cc
+ extendeddata_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ extendeddata_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ feature_test_SOURCES = feature_test.cc
+ feature_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ feature_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
++ -lgtest
+
+ folder_test_SOURCES = folder_test.cc
+ folder_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
+ folder_test_LDADD= libkmldom.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+- $(top_builddir)/third_party/libgtest.la
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list