QA: cleanning unused stuff

diff --git a/ChangeLog b/ChangeLog
index d14b8a35b99a6abfa33c3198f7922f2f87b1862b..4114d932097326f76b2784ae1ae3a59d5149c357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-03
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * QA: cleanning old stuff
+
 2008-09-01
 Quy Tonthat <qtonthat@gmail.com>:
        * Fixed crashes when creating new layers.

diff --git a/src/Makefile.am b/src/Makefile.am
index ea26a184b7c68a17034be78fb4e4bcb672fd9b1c..905c8c1a918a9fc742e7ae526c3f340252c264e5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,16 +79,21 @@ libviking_a_SOURCES = \
 
 if GOOGLE
 libviking_a_SOURCES += \
-       khmaps.c khmaps.h \
        google.c google.h \
-       googlemaps.c googlemaps.h \
-       google-maps.c google-maps.h \
        google-map-type.c google-map-type.h
 BUILT_SOURCES += \
-       google-maps.c google-maps.h \
        google-map-type.c google-map-type.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 \