google.c google.h
endif
-if OLDGOOGLE
-libviking_a_SOURCES += \
- googlemaps.c googlemaps.h
-endif
-
if TERRASERVER
libviking_a_SOURCES += \
terraserver.c terraserver.h
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@