Add Terraserver

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 61d8ed937cdf424022f5feaaf19a87c6cf5caee9..e11ae984f35af2ff518597998646f265009cd060 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,20 +5,26 @@ SUBDIRS = icons
 
 bin_PROGRAMS = viking
 
+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
 
-viking_SOURCES = main.c \
+$(BUILT_SOURCES): $(srcdir)/Makefile.am
+
+libviking_a_SOURCES = \
        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \
     degrees_converters.c degrees_converters.h \
-       viking.h globals.h mapcoord.h config.h \
+       globals.c globals.h \
+       viking.h mapcoord.h config.h \
        viktrack.c viktrack.h \
        vikwaypoint.c vikwaypoint.h \
        clipboard.c clipboard.h \
@@ -31,26 +37,26 @@ viking_SOURCES = main.c \
        util.c util.h \
        download.c download.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 \
+       vikgpslayer.c vikgpslayer.h \
+       vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.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 \
+       vikmapslayer.c vikmapslayer.h \
+       vik-map-type.c vik-map-type.h \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
@@ -63,7 +69,6 @@ viking_SOURCES = main.c \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
-       vikdemlayer_pixmap.h \
        vikfilelist.c vikfilelist.h \
        dems.c dems.h \
        srtm_continent.c \
@@ -73,33 +78,50 @@ viking_SOURCES = main.c \
        preferences.c preferences.h
 
 if GOOGLE
-viking_SOURCES += \
+libviking_a_SOURCES += \
        khmaps.c khmaps.h \
        google.c google.h \
-       googlemaps.c googlemaps.h
+       googlemaps.c googlemaps.h \
+       google-maps.c google-maps.h \
+       google-map-type.c google-map-type.h
 endif
 
 if TERRASERVER
-viking_SOURCES += \
+libviking_a_SOURCES += \
+       terraserver-map-type.c terraserver-map-type.h \
        terraserver.c terraserver.h
 endif
 
 if EXPEDIA
-viking_SOURCES += \
+libviking_a_SOURCES += \
        expedia.c expedia.h
 endif
 
 if OPENSTREETMAP
-viking_SOURCES += \
+libviking_a_SOURCES += \
        osm.c osm.h \
+       osm-map-type.c osm-map-type.h \
        osm-traces.c osm-traces.h
 endif
 
+viking_SOURCES = main.c
+
+%.h %.c:%.gob
+       gob2 $<
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
-LDADD           = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
+LDADD           = libviking.a @GTK_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
+
+@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)
+
+CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)