Fix <GTK 2.24 combo box usage.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 52925122d30a97ed780ef58e841e202270cab46a..765e1f47079501a082b14361dc09562e361bff22 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,18 +7,47 @@ bin_PROGRAMS = viking
 
 noinst_LIBRARIES = libviking.a
 
 
 noinst_LIBRARIES = libviking.a
 

-authors.h: ../AUTHORS
+authors.h: $(top_srcdir)/AUTHORS

        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "const gchar *AUTHORS[] = {\\" >> $@
        sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
        echo "NULL};" >> $@
 
        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "const gchar *AUTHORS[] = {\\" >> $@
        sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
        echo "NULL};" >> $@
 

-BUILT_SOURCES = authors.h
+if HAVE_XSLTPROC
+XP=@XP@
+documenters.h: $(top_srcdir)/help/C/viking.xml
+       $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
+else
+documenters.h:
+       rm -f $@
+       echo "/* Generated file. */" >> $@
+       echo "const gchar *DOCUMENTERS[] = {\\" >> $@
+       echo "NULL};" >> $@
+endif
+
+BUILT_SOURCES = authors.h documenters.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 =                         \
+        docbook2documenters.xsl      \
+        vikenumtypes.h.template      \
+        vikenumtypes.c.template
+
+BUILT_SOURCES += vikenumtypes.h vikenumtypes.c

 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 

+ENUM_H_FILES = \
+       vikviewport.h
+

 libviking_a_SOURCES = \
 libviking_a_SOURCES = \

+       bbox.h \

        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \
        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \


@@ -33,9 +62,11 @@ libviking_a_SOURCES = \
        gpspoint.c gpspoint.h \
        file.c file.h \
        authors.h \
        gpspoint.c gpspoint.h \
        file.c file.h \
        authors.h \

+       documenters.h \

        dialog.c dialog.h \
        util.c util.h \
        download.c download.h \
        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 \
        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h \
        viklayer.c viklayer.h \


@@ -45,9 +76,13 @@ libviking_a_SOURCES = \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
        vikaggregatelayer.c vikaggregatelayer.h \
        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 \
        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 \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
        thumbnails.c thumbnails.h \


@@ -55,11 +90,19 @@ libviking_a_SOURCES = \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \

+       vikmapsource.c vikmapsource.h \
+       vikmapsourcedefault.c vikmapsourcedefault.h \

        vikmapslayer.c vikmapslayer.h \
        vikmapslayer.c vikmapslayer.h \

+       vikmapslayer_compat.c vikmapslayer_compat.h \
+       vikmaptype.c vikmaptype.h \
+       vikslippymapsource.c vikslippymapsource.h \
+       vikwmscmapsource.c vikwmscmapsource.h \
+       viktmsmapsource.c viktmsmapsource.h \

         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
        babel.c babel.h \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
        babel.c babel.h \

+       datasource_file.c \

        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \
        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \


@@ -73,6 +116,7 @@ libviking_a_SOURCES = \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \

+       vikwebtoolbounds.c vikwebtoolbounds.h \

        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \
        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \


@@ -80,6 +124,12 @@ libviking_a_SOURCES = \
        print.c print.h \
        preferences.c preferences.h
 
        print.c print.h \
        preferences.c preferences.h
 

+if BING
+libviking_a_SOURCES += \
+       bingmapsource.c bingmapsource.h \
+       bing.c bing.h
+endif
+

 if GOOGLE
 libviking_a_SOURCES += \
        google.c google.h
 if GOOGLE
 libviking_a_SOURCES += \
        google.c google.h


@@ -87,6 +137,7 @@ endif
 
 if TERRASERVER
 libviking_a_SOURCES += \
 
 if TERRASERVER
 libviking_a_SOURCES += \

+       terraservermapsource.c terraservermapsource.h \

        terraserver.c terraserver.h
 endif
 
        terraserver.c terraserver.h
 endif
 


@@ -98,14 +149,26 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \
 if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \

-       osm-traces.c osm-traces.h
+       osm-traces.c osm-traces.h \
+       datasource_osm.c
+endif
+
+if BLUEMARBLE
+libviking_a_SOURCES += \
+       bluemarble.c bluemarble.h

 endif
 
 if GEONAMES
 libviking_a_SOURCES += \
 endif
 
 if GEONAMES
 libviking_a_SOURCES += \

+       geonames.c geonames.h \

        geonamessearch.c geonamessearch.h
 endif
 
        geonamessearch.c geonamessearch.h
 endif
 

+#if SPOTMAPS
+libviking_a_SOURCES += \
+       spotmaps.c spotmaps.h
+#endif
+

 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a


@@ -121,6 +184,6 @@ AM_CFLAGS           = -Wall -g -D_GNU_SOURCE \
 desktopdir = $(datadir)/applications
 desktop_in_files = viking.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 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)
 
 CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)