X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/a692cecc5eac4637af1c36cae65196f74ff54938..7705a76faab5d95d33231f2081e7fceb1f881d83:/src/Makefile.am?ds=sidebyside

diff --git a/src/Makefile.am b/src/Makefile.am
index 1276ca82..e598210e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,23 @@ authors.h: ../AUTHORS
 
 BUILT_SOURCES = authors.h
 
+vikenumtypes.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
+	(cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.h.template $(ENUM_H_FILES)) > $@
+
+vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
+	(cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
+
+EXTRA_DIST =                         \
+        vikenumtypes.h.template      \
+        vikenumtypes.c.template
+
+BUILT_SOURCES += vikenumtypes.h vikenumtypes.c
+
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
+ENUM_H_FILES = \
+	vikviewport.h
+
 libviking_a_SOURCES = \
 	modules.h modules.c \
 	curl_download.c curl_download.h \
@@ -36,6 +51,7 @@ libviking_a_SOURCES = \
 	dialog.c dialog.h \
 	util.c util.h \
 	download.c download.h \
+	vikenumtypes.c vikenumtypes.h \
 	viktreeview.c viktreeview.h \
 	viktrwlayer.c viktrwlayer.h \
 	viklayer.c viklayer.h \
@@ -45,9 +61,13 @@ libviking_a_SOURCES = \
 	vikwindow.c vikwindow.h \
 	vikviewport.c vikviewport.h \
 	vikaggregatelayer.c vikaggregatelayer.h \
+	vikgobjectbuilder.c vikgobjectbuilder.h \
 	vikgpslayer.c vikgpslayer.h \
 	vikgeoreflayer.c vikgeoreflayer.h \
 	vikfileentry.c vikfileentry.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 \
@@ -55,10 +75,12 @@ libviking_a_SOURCES = \
 	vikradiogroup.c vikradiogroup.h \
 	vikcoord.c vikcoord.h \
 	mapcache.c mapcache.h \
+	vikmapsource.c vikmapsource.h \
+	vikmapsourcedefault.c vikmapsourcedefault.h \
 	vikmapslayer.c vikmapslayer.h \
-	vik-map-type.c vik-map-type.h \
-	slippy-map-type-abstract.c slippy-map-type-abstract.h \
-	slippy-map-type.c slippy-map-type.h \
+	vikmapslayer_compat.c vikmapslayer_compat.h \
+	vikmaptype.c vikmaptype.h \
+	vikslippymapsource.c vikslippymapsource.h \
         gpx.c gpx.h \
 	garminsymbols.c garminsymbols.h \
 	acquire.c acquire.h \
@@ -72,6 +94,10 @@ libviking_a_SOURCES = \
 	dem.c dem.h \
 	vikdemlayer.h vikdemlayer.c \
 	vikfilelist.c vikfilelist.h \
+	vikexttool.c vikexttool.h \
+	vikexttools.c vikexttools.h \
+	vikwebtool.c vikwebtool.h \
+	vikwebtoolcenter.c vikwebtoolcenter.h \
 	dems.c dems.h \
 	srtm_continent.c \
 	uibuilder.c uibuilder.h \
@@ -79,30 +105,15 @@ libviking_a_SOURCES = \
 	print.c print.h \
 	preferences.c preferences.h
 
-BUILT_SOURCES += \
-	slippy-map-type-abstract.c slippy-map-type-abstract.h \
-	slippy-map-type.c slippy-map-type.h
-
 if GOOGLE
 libviking_a_SOURCES += \
 	google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-	khmaps.c khmaps.h \
-	googlemaps.c googlemaps.h \
-	google-maps.c google-maps.h \
-BUILT_SOURCES += \
-	google-maps.c google-maps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
-	terraserver-map-type.c terraserver-map-type.h \
+	terraservermapsource.c terraservermapsource.h \
 	terraserver.c terraserver.h
-BUILT_SOURCES += \
-	terraserver-map-type.c terraserver-map-type.h
 endif
 
 if EXPEDIA
@@ -121,29 +132,28 @@ libviking_a_SOURCES += \
 	bluemarble.c bluemarble.h
 endif
 
-if OPENAERIAL
+if GEONAMES
 libviking_a_SOURCES += \
-	openaerial.c openaerial.h
+	geonames.c geonames.h \
+	geonamessearch.c geonamessearch.h
 endif
 
 viking_SOURCES = main.c
 
-%.h %.c:%.gob
-	gob2 $<
-
-INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
-LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
-#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
-AM_CFLAGS		= -Wall -g -D_GNU_SOURCE
+AM_CFLAGS		= -Wall -g -D_GNU_SOURCE \
+	$(DISABLE_DEPRECATED_CFLAGS) \
+	$(PACKAGE_CFLAGS) \
+	@EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = viking.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST=$(desktop_in_files)
+EXTRA_DIST += $(desktop_in_files)
 
 CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)