Create the GObject builder

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 36151428042d2e4ea38c2f73c0182b29b18b9b77..058a1e795697d0d6006de8132ac344ee57d0a717 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,7 @@ libviking_a_SOURCES = \
        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 \
@@ -56,12 +57,11 @@ libviking_a_SOURCES = \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
        vikmapsource.c vikmapsource.h \
+       vikmapsourcedefault.c vikmapsourcedefault.h \
        vikmapslayer.c vikmapslayer.h \
        vikmapslayer_compat.c vikmapslayer_compat.h \
-       vik-map-type-default.c vik-map-type-default.h \
-       old-vik-map-type.c old-vik-map-type.h \
-       slippy-map-type-abstract.c slippy-map-type-abstract.h \
-       slippy-map-type.c slippy-map-type.h \
+       vikmaptype.c vikmaptype.h \
+       vikslippymapsource.c vikslippymapsource.h \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
@@ -75,6 +75,10 @@ libviking_a_SOURCES = \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        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 \
@@ -82,32 +86,15 @@ libviking_a_SOURCES = \
        print.c print.h \
        preferences.c preferences.h
 
-BUILT_SOURCES += \
-       vik-map-type-default.c vik-map-type-default.h \
-       slippy-map-type-abstract.c slippy-map-type-abstract.h \
-       slippy-map-type.c slippy-map-type.h \
-       old-vik-map-type.c old-vik-map-type.h
-
 if GOOGLE
 libviking_a_SOURCES += \
        google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-       khmaps.c khmaps.h \
-       googlemaps.c googlemaps.h \
-       google-maps.c google-maps.h \
-BUILT_SOURCES += \
-       google-maps.c google-maps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
-       terraserver-map-type.c terraserver-map-type.h \
+       terraservermapsource.c terraservermapsource.h \
        terraserver.c terraserver.h
-BUILT_SOURCES += \
-       terraserver-map-type.c terraserver-map-type.h
 endif
 
 if EXPEDIA
@@ -131,10 +118,12 @@ libviking_a_SOURCES += \
        openaerial.c openaerial.h
 endif
 
-viking_SOURCES = main.c
+if GEONAMES
+libviking_a_SOURCES += \
+       geonamessearch.c geonamessearch.h
+endif
 
-%.h %.c:%.gob
-       gob2 $<
+viking_SOURCES = main.c
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a