X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/92806042fbacaadd1a9216d01c7b2503ede459af..5ff75d1ed34298a223c651d46fe2aa000db3e459:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 81b12805..52925122 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,11 +85,6 @@ libviking_a_SOURCES += \
 	google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-	googlemaps.c googlemaps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
 	terraserver.c terraserver.h
@@ -106,15 +101,20 @@ libviking_a_SOURCES += \
 	osm-traces.c osm-traces.h
 endif
 
+if GEONAMES
+libviking_a_SOURCES += \
+	geonamessearch.c geonamessearch.h
+endif
+
 viking_SOURCES = main.c
 
-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 \
+	$(PACKAGE_CFLAGS) \
+	@EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 
 @INTLTOOL_DESKTOP_RULE@