X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/6571a7dea270c013e1c88e08c740e77a80e15cbb..4a050412da32aa6f237c358cfa0c5a3775f21e9a:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 790b807d..765e1f47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,14 +7,26 @@ bin_PROGRAMS = viking
 
 noinst_LIBRARIES = libviking.a
 
-authors.h: ../AUTHORS
+authors.h: $(top_srcdir)/AUTHORS
 	rm -f $@
 	echo "/* Generated file. */" >> $@
 	echo "const gchar *AUTHORS[] = {\\" >> $@
 	sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
 	echo "NULL};" >> $@
 
-BUILT_SOURCES = authors.h
+if HAVE_XSLTPROC
+XP=@XP@
+documenters.h: $(top_srcdir)/help/C/viking.xml
+	$(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
+else
+documenters.h:
+	rm -f $@
+	echo "/* Generated file. */" >> $@
+	echo "const gchar *DOCUMENTERS[] = {\\" >> $@
+	echo "NULL};" >> $@
+endif
+
+BUILT_SOURCES = authors.h documenters.h
 
 vikenumtypes.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.h.template $(ENUM_H_FILES)) > $@
@@ -23,6 +35,7 @@ vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
 EXTRA_DIST =                         \
+        docbook2documenters.xsl      \
         vikenumtypes.h.template      \
         vikenumtypes.c.template
 
@@ -34,6 +47,7 @@ ENUM_H_FILES = \
 	vikviewport.h
 
 libviking_a_SOURCES = \
+	bbox.h \
 	modules.h modules.c \
 	curl_download.c curl_download.h \
 	menu.xml.h \
@@ -48,6 +62,7 @@ libviking_a_SOURCES = \
 	gpspoint.c gpspoint.h \
 	file.c file.h \
 	authors.h \
+	documenters.h \
 	dialog.c dialog.h \
 	util.c util.h \
 	download.c download.h \
@@ -65,8 +80,9 @@ libviking_a_SOURCES = \
 	vikgpslayer.c vikgpslayer.h \
 	vikgeoreflayer.c vikgeoreflayer.h \
 	vikfileentry.c vikfileentry.h \
-	viksearchtool.c viksearchtool.h \
-	viksearch.c viksearch.h \
+	vikgototool.c vikgototool.h \
+	vikgotoxmltool.c vikgotoxmltool.h \
+	vikgoto.c vikgoto.h \
 	viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
 	viktrwlayer_propwin.c viktrwlayer_propwin.h \
 	thumbnails.c thumbnails.h \
@@ -80,10 +96,13 @@ libviking_a_SOURCES = \
 	vikmapslayer_compat.c vikmapslayer_compat.h \
 	vikmaptype.c vikmaptype.h \
 	vikslippymapsource.c vikslippymapsource.h \
+	vikwmscmapsource.c vikwmscmapsource.h \
+	viktmsmapsource.c viktmsmapsource.h \
         gpx.c gpx.h \
 	garminsymbols.c garminsymbols.h \
 	acquire.c acquire.h \
 	babel.c babel.h \
+	datasource_file.c \
 	datasource_gps.c \
 	datasource_google.c \
 	datasource_gc.c \
@@ -97,6 +116,7 @@ libviking_a_SOURCES = \
 	vikexttools.c vikexttools.h \
 	vikwebtool.c vikwebtool.h \
 	vikwebtoolcenter.c vikwebtoolcenter.h \
+	vikwebtoolbounds.c vikwebtoolbounds.h \
 	dems.c dems.h \
 	srtm_continent.c \
 	uibuilder.c uibuilder.h \
@@ -104,6 +124,12 @@ libviking_a_SOURCES = \
 	print.c print.h \
 	preferences.c preferences.h
 
+if BING
+libviking_a_SOURCES += \
+	bingmapsource.c bingmapsource.h \
+	bing.c bing.h
+endif
+
 if GOOGLE
 libviking_a_SOURCES += \
 	google.c google.h
@@ -123,7 +149,8 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
 	osm.c osm.h \
-	osm-traces.c osm-traces.h
+	osm-traces.c osm-traces.h \
+	datasource_osm.c
 endif
 
 if BLUEMARBLE
@@ -131,16 +158,17 @@ libviking_a_SOURCES += \
 	bluemarble.c bluemarble.h
 endif
 
-if OPENAERIAL
-libviking_a_SOURCES += \
-	openaerial.c openaerial.h
-endif
-
 if GEONAMES
 libviking_a_SOURCES += \
+	geonames.c geonames.h \
 	geonamessearch.c geonamessearch.h
 endif
 
+#if SPOTMAPS
+libviking_a_SOURCES += \
+	spotmaps.c spotmaps.h
+#endif
+
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
@@ -148,7 +176,6 @@ if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
 AM_CFLAGS		= -Wall -g -D_GNU_SOURCE \
-	$(DISABLE_DEPRECATED_CFLAGS) \
 	$(PACKAGE_CFLAGS) \
 	@EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@