Merge branch 'master' into i18n-launchpad

[andy/viking.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index dde4da2b3fa3986dfd34dad77a9931376256f38c..367cc87527b10573282b1700a4b107a98d3bffde 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,13 +10,29 @@ noinst_LIBRARIES = libviking.a
 authors.h: ../AUTHORS
        rm -f $@
        echo "/* Generated file. */" >> $@
-       echo "#define AUTHORS \\" >> $@
-       sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/\\n"\\/' -e '$$s/\\$$//' $< >> $@
+       echo "const gchar *AUTHORS[] = {\\" >> $@
+       sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
+       echo "NULL};" >> $@
 
 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 \
@@ -35,27 +51,36 @@ 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 viktrwlayer_pixmap.h \
+       viktrwlayer.c viktrwlayer.h \
        viklayer.c viklayer.h \
        viklayerspanel.c viklayerspanel.h \
-       vikcoordlayer.c vikcoordlayer.h vikcoordlayer_pixmap.h \
+       vikcoordlayer.c vikcoordlayer.h \
        vikstatus.c vikstatus.h \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
-       vikaggregatelayer.c vikaggregatelayer.h vikaggregatelayer_pixmap.h \
-       vikgpslayer.c vikgpslayer.h vikgpslayer_pixmap.h \
-       vikgeoreflayer.c vikgeoreflayer.h vikgeoreflayer_pixmap.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 thumbnails_pixbuf.h \
+       thumbnails.c thumbnails.h \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
-       vikmapslayer.c vikmapslayer.h vikmapslayer_pixmap.h \
-       gtkcellrendererprogress.c gtkcellrendererprogress.h \
+       vikmapsource.c vikmapsource.h \
+       vikmapsourcedefault.c vikmapsourcedefault.h \
+       vikmapslayer.c vikmapslayer.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 \
@@ -68,8 +93,11 @@ libviking_a_SOURCES = \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
-       vikdemlayer_pixmap.h \
        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,13 +107,12 @@ libviking_a_SOURCES = \
 
 if GOOGLE
 libviking_a_SOURCES += \
-       khmaps.c khmaps.h \
-       google.c google.h \
-       googlemaps.c googlemaps.h
+       google.c google.h
 endif
 
 if TERRASERVER
 libviking_a_SOURCES += \
+       terraservermapsource.c terraservermapsource.h \
        terraserver.c terraserver.h
 endif
 
@@ -100,21 +127,38 @@ libviking_a_SOURCES += \
        osm-traces.c osm-traces.h
 endif
 
+if BLUEMARBLE
+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
+
 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 \
+       $(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)