Improve key binding for Mercator Mode -> ctrl+m

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 17fd01e34476d3ac099e8b5370be501b2b757e15..ce76fcf71e95acffbb9521635f01f9a7f17de690 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,14 +7,26 @@ 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.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.h.template $(ENUM_H_FILES)) > $@


@@ -23,6 +35,7 @@ vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
 EXTRA_DIST =                         \
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
 EXTRA_DIST =                         \

+        docbook2documenters.xsl      \

         vikenumtypes.h.template      \
         vikenumtypes.c.template
 
         vikenumtypes.h.template      \
         vikenumtypes.c.template
 


@@ -48,6 +61,7 @@ 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 \


@@ -65,6 +79,9 @@ libviking_a_SOURCES = \
        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 \


@@ -78,6 +95,8 @@ libviking_a_SOURCES = \
        vikmapslayer_compat.c vikmapslayer_compat.h \
        vikmaptype.c vikmaptype.h \
        vikslippymapsource.c vikslippymapsource.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 \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \


@@ -129,25 +148,21 @@ libviking_a_SOURCES += \
        bluemarble.c bluemarble.h
 endif
 
        bluemarble.c bluemarble.h
 endif
 

-if OPENAERIAL
-libviking_a_SOURCES += \
-       openaerial.c openaerial.h
-endif
-

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

+       geonames.c geonames.h \

        geonamessearch.c geonamessearch.h
 endif
 
 viking_SOURCES = main.c
 
        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
 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@
 
 
 @INTLTOOL_DESKTOP_RULE@