|
 |
534d585 |
--- configure.ac~ 2009-01-12 20:34:47.000000000 +0300
|
|
|
534d585 |
+++ configure.ac 2009-01-30 12:21:01.018236863 +0300
|
|
|
534d585 |
@@ -210,7 +210,6 @@
|
|
|
534d585 |
testdata/update/Makefile
|
|
|
534d585 |
testdata/xal/Makefile
|
|
|
534d585 |
testdata/xsd/Makefile
|
|
|
534d585 |
- third_party/Makefile
|
|
|
534d585 |
xcode/Makefile
|
|
|
534d585 |
xcode/LibKML/Makefile
|
|
|
534d585 |
])
|
|
|
534d585 |
--- examples/engine/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300
|
|
|
534d585 |
+++ examples/engine/Makefile.am 2009-01-30 15:09:43.408236214 +0300
|
|
|
534d585 |
@@ -1,6 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
--- examples/gpx/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300
|
|
|
534d585 |
+++ examples/gpx/Makefile.am 2009-01-30 15:08:44.819235790 +0300
|
|
|
534d585 |
@@ -1,5 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
--- examples/hellonet/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300
|
|
|
534d585 |
+++ examples/hellonet/Makefile.am 2009-01-30 16:07:34.089236539 +0300
|
|
|
534d585 |
@@ -1,8 +1,6 @@
|
|
|
534d585 |
if HAVE_CURL
|
|
|
534d585 |
AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/examples/hellonet \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include
|
|
|
534d585 |
+ -I$(top_srcdir)/examples/hellonet
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
--- examples/helloworld/Makefile.am~ 2009-01-10 01:04:32.000000000 +0300
|
|
|
534d585 |
+++ examples/helloworld/Makefile.am 2009-01-30 16:05:34.819235683 +0300
|
|
|
534d585 |
@@ -1,7 +1,5 @@
|
|
|
534d585 |
AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/examples/helloworld \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include
|
|
|
534d585 |
+ -I$(top_srcdir)/examples/helloworld
|
|
|
534d585 |
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
@@ -11,7 +9,7 @@
|
|
|
534d585 |
noinst_LTLIBRARIES = libhelloutil.la
|
|
|
534d585 |
|
|
|
534d585 |
libhelloutil_la_SOURCES = print.cc
|
|
|
534d585 |
-libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
|
|
|
534d585 |
+libhelloutil_la_LIBADD = -lminizip -lz
|
|
|
534d585 |
|
|
|
534d585 |
noinst_PROGRAMS = countkml createkml checklinks helloattrs helloenum \
|
|
|
534d585 |
hellofeatures hellofolder hellogeometry hellohref hellokmz \
|
|
|
534d585 |
--- examples/regionator/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300
|
|
|
534d585 |
+++ examples/regionator/Makefile.am 2009-01-30 15:14:04.349235516 +0300
|
|
|
534d585 |
@@ -1,7 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
--- examples/xsd/Makefile.am~ 2008-11-04 21:58:19.000000000 +0300
|
|
|
534d585 |
+++ examples/xsd/Makefile.am 2009-01-30 15:15:02.697234587 +0300
|
|
|
534d585 |
@@ -1,6 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/examples/xsd \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
--- Makefile.am~ 2009-01-09 22:31:04.000000000 +0300
|
|
|
534d585 |
+++ Makefile.am 2009-01-30 12:20:11.472234263 +0300
|
|
|
534d585 |
@@ -1,7 +1,7 @@
|
|
|
534d585 |
ACLOCAL_AMFLAGS = -I m4
|
|
|
534d585 |
|
|
|
534d585 |
# Order is important:
|
|
|
534d585 |
-SUBDIRS = third_party src testdata examples msvc xcode
|
|
|
534d585 |
+SUBDIRS = src testdata examples msvc xcode
|
|
|
534d585 |
|
|
|
534d585 |
EXTRA_DIST = \
|
|
|
534d585 |
AUTHORS \
|
|
|
534d585 |
--- src/kml/base/Makefile.am~ 2009-01-09 22:31:01.000000000 +0300
|
|
|
534d585 |
+++ src/kml/base/Makefile.am 2009-01-30 14:19:54.415237475 +0300
|
|
|
534d585 |
@@ -1,14 +1,11 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
|
|
|
534d585 |
endif
|
|
|
534d585 |
|
|
|
534d585 |
-libkmlbase_la_LDFLAGS = -lexpat
|
|
|
534d585 |
+libkmlbase_la_LDFLAGS = -lexpat -luriparser
|
|
|
534d585 |
|
|
|
534d585 |
lib_LTLIBRARIES = libkmlbase.la
|
|
|
534d585 |
libkmlbase_la_SOURCES = \
|
|
|
534d585 |
@@ -75,90 +72,71 @@
|
|
|
534d585 |
|
|
|
534d585 |
attributes_test_SOURCES = attributes_test.cc
|
|
|
534d585 |
attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-attributes_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+attributes_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
color32_test_SOURCES = color32_test.cc
|
|
|
534d585 |
color32_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-color32_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+color32_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
date_time_test_SOURCES = date_time_test.cc
|
|
|
534d585 |
date_time_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-date_time_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+date_time_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
expat_handler_ns_test_SOURCES = expat_handler_ns_test.cc
|
|
|
534d585 |
expat_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-expat_handler_ns_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+expat_handler_ns_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
expat_parser_test_SOURCES = expat_parser_test.cc
|
|
|
534d585 |
expat_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-expat_parser_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+expat_parser_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
file_test_SOURCES = file_test.cc
|
|
|
534d585 |
file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-file_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+file_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
net_cache_test_SOURCES = net_cache_test.cc
|
|
|
534d585 |
net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-net_cache_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+net_cache_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
referent_test_SOURCES = referent_test.cc
|
|
|
534d585 |
referent_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-referent_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+referent_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
tempfile_test_SOURCES = tempfile_test.cc
|
|
|
534d585 |
tempfile_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-tempfile_test_LDADD = libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+tempfile_test_LDADD = libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
string_util_test_SOURCES = string_util_test.cc
|
|
|
534d585 |
string_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-string_util_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+string_util_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
time_util_test_SOURCES = time_util_test.cc
|
|
|
534d585 |
time_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-time_util_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+time_util_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
util_test_SOURCES = util_test.cc
|
|
|
534d585 |
util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-util_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+util_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
uri_parser_test_SOURCES = uri_parser_test.cc
|
|
|
534d585 |
uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-uri_parser_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+uri_parser_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
vec3_test_SOURCES = vec3_test.cc
|
|
|
534d585 |
vec3_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-vec3_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+vec3_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xml_element_test_SOURCES = xml_element_test.cc
|
|
|
534d585 |
xml_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-xml_element_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+xml_element_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xml_file_test_SOURCES = xml_file_test.cc
|
|
|
534d585 |
xml_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-xml_file_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+xml_file_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xmlns_test_SOURCES = xmlns_test.cc
|
|
|
534d585 |
xmlns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
-xmlns_test_LDADD= libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+xmlns_test_LDADD= libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
|
|
|
534d585 |
--- src/kml/convenience/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300
|
|
|
534d585 |
+++ src/kml/convenience/Makefile.am 2009-01-30 13:08:16.410236843 +0300
|
|
|
534d585 |
@@ -1,7 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
@@ -40,47 +37,41 @@
|
|
|
534d585 |
convenience_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
csv_file_test_SOURCES = csv_file_test.cc
|
|
|
534d585 |
csv_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
csv_file_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
element_counter_test_SOURCES = element_counter_test.cc
|
|
|
534d585 |
element_counter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
element_counter_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
feature_list_test_SOURCES = feature_list_test.cc
|
|
|
534d585 |
feature_list_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
feature_list_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
gpx_trk_pt_handler_test_SOURCES = gpx_trk_pt_handler_test.cc
|
|
|
534d585 |
gpx_trk_pt_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
gpx_trk_pt_handler_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/dom/libkmldom.la
|
|
|
534d585 |
|
|
|
534d585 |
kmz_check_links_test_SOURCES = kmz_check_links_test.cc
|
|
|
534d585 |
kmz_check_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kmz_check_links_test_LDADD = libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
--- src/kml/dom/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300
|
|
|
534d585 |
+++ src/kml/dom/Makefile.am 2009-01-30 14:28:40.501235777 +0300
|
|
|
534d585 |
@@ -1,12 +1,12 @@
|
|
|
534d585 |
-AM_CPPFLAGS= -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS= -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
|
|
|
534d585 |
endif
|
|
|
534d585 |
|
|
|
534d585 |
+libkmldom_la_LDFLAGS = -lexpat
|
|
|
534d585 |
+
|
|
|
534d585 |
lib_LTLIBRARIES = libkmldom.la
|
|
|
534d585 |
libkmldom_la_SOURCES = \
|
|
|
534d585 |
abstractlatlonbox.cc \
|
|
|
534d585 |
@@ -167,283 +167,236 @@
|
|
|
534d585 |
abstractlatlonbox_test_SOURCES = abstractlatlonbox_test.cc
|
|
|
534d585 |
abstractlatlonbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
abstractlatlonbox_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
abstractview_test_SOURCES = abstractview_test.cc
|
|
|
534d585 |
abstractview_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
abstractview_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
atom_test_SOURCES = atom_test.cc
|
|
|
534d585 |
atom_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
atom_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
balloonstyle_test_SOURCES = balloonstyle_test.cc
|
|
|
534d585 |
balloonstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
balloonstyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
colorstyle_test_SOURCES = colorstyle_test.cc
|
|
|
534d585 |
colorstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
colorstyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
container_test_SOURCES = container_test.cc
|
|
|
534d585 |
container_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
container_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
document_test_SOURCES = document_test.cc
|
|
|
534d585 |
document_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
document_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
element_test_SOURCES = element_test.cc
|
|
|
534d585 |
element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
element_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
extendeddata_test_SOURCES = extendeddata_test.cc
|
|
|
534d585 |
extendeddata_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
extendeddata_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
feature_test_SOURCES = feature_test.cc
|
|
|
534d585 |
feature_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
feature_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
folder_test_SOURCES = folder_test.cc
|
|
|
534d585 |
folder_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
folder_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
geometry_test_SOURCES = geometry_test.cc
|
|
|
534d585 |
geometry_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
geometry_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
hotspot_test_SOURCES = hotspot_test.cc
|
|
|
534d585 |
hotspot_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
hotspot_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
iconstyle_test_SOURCES = iconstyle_test.cc
|
|
|
534d585 |
iconstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
iconstyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_cast_test_SOURCES = kml_cast_test.cc
|
|
|
534d585 |
kml_cast_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_cast_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_test_SOURCES = kml_test.cc
|
|
|
534d585 |
kml_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_factory_test_SOURCES = kml_factory_test.cc
|
|
|
534d585 |
kml_factory_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_factory_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml22_test_SOURCES = kml22_test.cc
|
|
|
534d585 |
kml22_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml22_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
labelstyle_test_SOURCES = labelstyle_test.cc
|
|
|
534d585 |
labelstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
labelstyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
linestyle_test_SOURCES = linestyle_test.cc
|
|
|
534d585 |
linestyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
linestyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
link_test_SOURCES = link_test.cc
|
|
|
534d585 |
link_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
link_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
liststyle_test_SOURCES = liststyle_test.cc
|
|
|
534d585 |
liststyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
liststyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
model_test_SOURCES = model_test.cc
|
|
|
534d585 |
model_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
model_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
networklink_test_SOURCES = networklink_test.cc
|
|
|
534d585 |
networklink_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
networklink_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
networklinkcontrol_test_SOURCES = networklinkcontrol_test.cc
|
|
|
534d585 |
networklinkcontrol_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
networklinkcontrol_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
object_test_SOURCES = object_test.cc
|
|
|
534d585 |
object_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
object_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
overlay_test_SOURCES = overlay_test.cc
|
|
|
534d585 |
overlay_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
overlay_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
placemark_test_SOURCES = placemark_test.cc
|
|
|
534d585 |
placemark_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
placemark_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
polystyle_test_SOURCES = polystyle_test.cc
|
|
|
534d585 |
polystyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
polystyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
region_test_SOURCES = region_test.cc
|
|
|
534d585 |
region_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
region_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
round_trip_test_SOURCES = round_trip_test.cc
|
|
|
534d585 |
round_trip_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
round_trip_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
schema_test_SOURCES = schema_test.cc
|
|
|
534d585 |
schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
schema_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
snippet_test_SOURCES = snippet_test.cc
|
|
|
534d585 |
snippet_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
snippet_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
style_test_SOURCES = style_test.cc
|
|
|
534d585 |
style_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
style_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
stylemap_test_SOURCES = stylemap_test.cc
|
|
|
534d585 |
stylemap_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
stylemap_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
styleselector_test_SOURCES = styleselector_test.cc
|
|
|
534d585 |
styleselector_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
styleselector_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
substyle_test_SOURCES = substyle_test.cc
|
|
|
534d585 |
substyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
substyle_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
timeprimitive_test_SOURCES = timeprimitive_test.cc
|
|
|
534d585 |
timeprimitive_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
timeprimitive_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
vec2_test_SOURCES = vec2_test.cc
|
|
|
534d585 |
vec2_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
vec2_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
unknown_test_SOURCES = unknown_test.cc
|
|
|
534d585 |
unknown_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
unknown_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_handler_test_SOURCES = kml_handler_test.cc
|
|
|
534d585 |
kml_handler_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_handler_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_handler_ns_test_SOURCES = kml_handler_ns_test.cc
|
|
|
534d585 |
kml_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_handler_ns_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
parser_test_SOURCES = parser_test.cc
|
|
|
534d585 |
parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
parser_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
serializer_test_SOURCES = serializer_test.cc
|
|
|
534d585 |
serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
serializer_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xal_test_SOURCES = xal_test.cc
|
|
|
534d585 |
xal_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xal_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xml_serializer_test_SOURCES = xml_serializer_test.cc
|
|
|
534d585 |
xml_serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xml_serializer_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_test_SOURCES = xsd_test.cc
|
|
|
534d585 |
xsd_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_test_LDADD= libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
--- src/kml/engine/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300
|
|
|
534d585 |
+++ src/kml/engine/Makefile.am 2009-01-30 14:50:53.452235945 +0300
|
|
|
534d585 |
@@ -1,14 +1,12 @@
|
|
|
534d585 |
-AM_CPPFLAGS= -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS= -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
|
|
|
534d585 |
endif
|
|
|
534d585 |
|
|
|
534d585 |
+libkmlengine_la_LDFLAGS = -lminizip -lz
|
|
|
534d585 |
+
|
|
|
534d585 |
lib_LTLIBRARIES = libkmlengine.la
|
|
|
534d585 |
libkmlengine_la_SOURCES = \
|
|
|
534d585 |
clone.cc \
|
|
|
534d585 |
@@ -35,8 +33,6 @@
|
|
|
534d585 |
update.cc
|
|
|
534d585 |
|
|
|
534d585 |
libkmlengine_la_LIBADD = \
|
|
|
534d585 |
- $(top_builddir)/third_party/libminizip.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
libkmlengineincludedir = $(includedir)/kml/engine
|
|
|
534d585 |
@@ -105,189 +101,156 @@
|
|
|
534d585 |
bbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
bbox_test_LDADD = libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
clone_test_SOURCES = clone_test.cc
|
|
|
534d585 |
clone_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
clone_test_LDADD = libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
entity_mapper_test_SOURCES = entity_mapper_test.cc
|
|
|
534d585 |
entity_mapper_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
entity_mapper_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
feature_balloon_test_SOURCES = feature_balloon_test.cc
|
|
|
534d585 |
feature_balloon_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
feature_balloon_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
feature_visitor_test_SOURCES = feature_visitor_test.cc
|
|
|
534d585 |
feature_visitor_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
feature_visitor_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
find_test_SOURCES = find_test.cc
|
|
|
534d585 |
find_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
find_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
get_link_parents_test_SOURCES = get_link_parents_test.cc
|
|
|
534d585 |
get_link_parents_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
get_link_parents_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
get_links_test_SOURCES = get_links_test.cc
|
|
|
534d585 |
get_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
get_links_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
href_test_SOURCES = href_test.cc
|
|
|
534d585 |
href_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
href_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
id_mapper_test_SOURCES = id_mapper_test.cc
|
|
|
534d585 |
id_mapper_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
id_mapper_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_cache_test_SOURCES = kml_cache_test.cc
|
|
|
534d585 |
kml_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_cache_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_file_test_SOURCES = kml_file_test.cc
|
|
|
534d585 |
kml_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_file_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_stream_test_SOURCES = kml_stream_test.cc
|
|
|
534d585 |
kml_stream_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_stream_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kml_uri_test_SOURCES = kml_uri_test.cc
|
|
|
534d585 |
kml_uri_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kml_uri_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kmz_cache_test_SOURCES = kmz_cache_test.cc
|
|
|
534d585 |
kmz_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kmz_cache_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
kmz_file_test_SOURCES = kmz_file_test.cc
|
|
|
534d585 |
kmz_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
kmz_file_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
link_util_test_SOURCES = link_util_test.cc
|
|
|
534d585 |
link_util_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
link_util_test_LDADD = libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
location_util_test_SOURCES = location_util_test.cc
|
|
|
534d585 |
location_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
location_util_test_LDADD = libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
merge_test_SOURCES = merge_test.cc
|
|
|
534d585 |
merge_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
merge_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
object_id_parser_observer_test_SOURCES = object_id_parser_observer_test.cc
|
|
|
534d585 |
object_id_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
object_id_parser_observer_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
parse_old_schema_test_SOURCES = parse_old_schema_test.cc
|
|
|
534d585 |
parse_old_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
parse_old_schema_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
schema_parser_observer_test_SOURCES = schema_parser_observer_test.cc
|
|
|
534d585 |
schema_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
schema_parser_observer_test_LDADD= \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
shared_style_parser_observer_test_SOURCES = shared_style_parser_observer_test.cc
|
|
|
534d585 |
shared_style_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
shared_style_parser_observer_test_LDADD= \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
style_merger_test_SOURCES = style_merger_test.cc
|
|
|
534d585 |
style_merger_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
style_merger_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
style_resolver_test_SOURCES = style_resolver_test.cc
|
|
|
534d585 |
style_resolver_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
style_resolver_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
update_test_SOURCES = update_test.cc
|
|
|
534d585 |
update_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
update_test_LDADD= libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/liburiparser.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
--- src/kml/regionator/Makefile.am~ 2008-10-28 07:29:52.000000000 +0300
|
|
|
534d585 |
+++ src/kml/regionator/Makefile.am 2009-01-30 13:14:42.100236700 +0300
|
|
|
534d585 |
@@ -1,7 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS= -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS= -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
@@ -37,8 +34,7 @@
|
|
|
534d585 |
$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
regionator_test_SOURCES = regionator_test.cc
|
|
|
534d585 |
regionator_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
@@ -46,8 +42,7 @@
|
|
|
534d585 |
$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
regionator_qid_test_SOURCES = regionator_qid_test.cc
|
|
|
534d585 |
regionator_qid_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
@@ -55,8 +50,7 @@
|
|
|
534d585 |
$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
regionator_util_test_SOURCES = regionator_util_test.cc
|
|
|
534d585 |
regionator_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
@@ -64,7 +58,6 @@
|
|
|
534d585 |
$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/engine/libkmlengine.la \
|
|
|
534d585 |
$(top_builddir)/src/kml/dom/libkmldom.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
--- src/kml/xsd/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300
|
|
|
534d585 |
+++ src/kml/xsd/Makefile.am 2009-01-30 13:15:36.758234683 +0300
|
|
|
534d585 |
@@ -1,6 +1,4 @@
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/googletest-r108/include
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
if GCC
|
|
|
534d585 |
AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
|
|
|
534d585 |
@@ -48,55 +46,46 @@
|
|
|
534d585 |
xsd_complex_type_test_SOURCES = xsd_complex_type_test.cc
|
|
|
534d585 |
xsd_complex_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_complex_type_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_file_test_SOURCES = xsd_file_test.cc
|
|
|
534d585 |
xsd_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_file_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_element_test_SOURCES = xsd_element_test.cc
|
|
|
534d585 |
xsd_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_element_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_handler_test_SOURCES = xsd_handler_test.cc
|
|
|
534d585 |
xsd_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_handler_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_primitive_type_test_SOURCES = xsd_primitive_type_test.cc
|
|
|
534d585 |
xsd_primitive_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_primitive_type_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_schema_test_SOURCES = xsd_schema_test.cc
|
|
|
534d585 |
xsd_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_schema_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_simple_type_test_SOURCES = xsd_simple_type_test.cc
|
|
|
534d585 |
xsd_simple_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_simple_type_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xsd_util_test_SOURCES = xsd_util_test.cc
|
|
|
534d585 |
xsd_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xsd_util_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
xst_parser_test_SOURCES = xst_parser_test.cc
|
|
|
534d585 |
xst_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
|
|
|
534d585 |
xst_parser_test_LDADD = libkmlxsd.la \
|
|
|
534d585 |
- $(top_builddir)/src/kml/base/libkmlbase.la \
|
|
|
534d585 |
- $(top_builddir)/third_party/libgtest.la
|
|
|
534d585 |
+ $(top_builddir)/src/kml/base/libkmlbase.la
|
|
|
534d585 |
|
|
|
534d585 |
CLEANFILES = check_PROGRAMS
|
|
|
534d585 |
--- src/swig/Makefile.am~ 2008-10-29 02:04:39.000000000 +0300
|
|
|
534d585 |
+++ src/swig/Makefile.am 2009-01-30 13:22:24.128236653 +0300
|
|
|
534d585 |
@@ -1,8 +1,6 @@
|
|
|
534d585 |
SUBDIRS = java python
|
|
|
534d585 |
|
|
|
534d585 |
-AM_CPPFLAGS = -I$(top_srcdir)/src \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/boost_1_34_1 \
|
|
|
534d585 |
- -I$(top_srcdir)/third_party/uriparser-0.7.1/include
|
|
|
534d585 |
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
|
|
534d585 |
|
|
|
534d585 |
|
|
|
534d585 |
|