[libchamplain] Remove all Memphis build condition checks

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit a631ddab899c87a84d9c3c06ffbc9ff131b0267e
Author: Simon Wenner <simon wenner ch>
Date:   Sat Sep 5 20:43:55 2009 +0200

    Remove all Memphis build condition checks

 champlain/Makefile.am                    |   45 ++++++++++++------------------
 champlain/champlain-map-source-factory.c |    8 -----
 champlain/champlain-map-source-factory.h |    2 -
 champlain/champlain.h                    |    2 -
 4 files changed, 18 insertions(+), 39 deletions(-)
---
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 0c9d494..6495b7e 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -31,8 +31,12 @@ libchamplain_headers = \
 	champlain-map-source-factory.h	\
 	champlain-map-source-desc.h	\
 	champlain-polygon.h		\
-	champlain-version.h
-
+	champlain-version.h		\
+	champlain-memphis-map-source.h  \
+	champlain-map-data-source.h	\
+	champlain-local-map-data-source.h \
+	champlain-network-map-data-source.h \
+	champlain-bounding-box.h
 
 libchamplain_0_5_la_SOURCES = \
 	$(CHAMPLAIN_MARSHAL_LIST) 	\
@@ -52,7 +56,12 @@ libchamplain_0_5_la_SOURCES = \
 	champlain-map-source-desc.c	\
 	champlain-point.c		\
 	champlain-cache.c		\
-	champlain-polygon.c
+	champlain-polygon.c	\
+	champlain-memphis-map-source.c  \
+	champlain-map-data-source.c \
+	champlain-local-map-data-source.c \
+	champlain-network-map-data-source.c \
+	champlain-bounding-box.c
 
 noinst_HEADERS = \
 	champlain-debug.h  		\
@@ -91,7 +100,12 @@ libchamplain_include_HEADERS = \
 	champlain-marker.h		\
 	champlain-cache.h		\
 	champlain-polygon.h		\
-	champlain-version.h
+	champlain-version.h		\
+	champlain-memphis-map-source.h  \
+	champlain-map-data-source.h \
+	champlain-local-map-data-source.h \
+	champlain-network-map-data-source.h \
+	champlain-bounding-box.h
 
 libchamplain_0_5_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) ../tidy/libtidy-1.0.la
 
@@ -110,29 +124,6 @@ AM_CPPFLAGS = 				\
 	-DCHAMPLAIN_COMPILATION 	\
 	$(WARN_CFLAGS)
 
-if ENABLE_MEMPHIS
-libchamplain_headers += \
-	champlain-memphis-map-source.h  \
-	champlain-map-data-source.h	\
-	champlain-local-map-data-source.h \
-	champlain-network-map-data-source.h \
-	champlain-bounding-box.h
-libchamplain_0_3_la_SOURCES += \
-	champlain-memphis-map-source.c  \
-	champlain-map-data-source.c \
-	champlain-local-map-data-source.c \
-	champlain-network-map-data-source.c \
-	champlain-bounding-box.c
-libchamplain_include_HEADERS += \
-	champlain-memphis-map-source.h  \
-	champlain-map-data-source.h \
-	champlain-local-map-data-source.h \
-	champlain-network-map-data-source.h \
-	champlain-bounding-box.h
-libchamplain_0_3_la_LIBADD += ../memphis/libmemphis-1.0.la
-AM_CPPFLAGS += -I$(top_srcdir)/memphis -DMEMPHIS_ENABLED
-endif
-
 EXTRA_DIST = $(CHAMPLAIN_MARSHAL_LIST)
 
 champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 0b6e342..da8f828 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -76,10 +76,8 @@ struct _ChamplainMapSourceFactoryPrivate
 static ChamplainMapSource * champlain_map_source_new_generic (
      ChamplainMapSourceDesc *desc, gpointer data);
 
-#ifdef MEMPHIS_ENABLED
 static ChamplainMapSource * champlain_map_source_new_memphis (
     ChamplainMapSourceDesc *desc, gpointer user_data);
-#endif
 
 static void
 champlain_map_source_factory_get_property (GObject *object,
@@ -252,7 +250,6 @@ ChamplainMapSourceDesc MFF_RELIEF_DESC =
     NULL
   };
 
-#ifdef MEMPHIS_ENABLED
 static
 ChamplainMapSourceDesc MEMPHIS_LOCAL_DESC =
   {
@@ -282,7 +279,6 @@ ChamplainMapSourceDesc MEMPHIS_NETWORK_DESC =
     "",
     NULL
   };
-#endif
 
 static void
 champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
@@ -307,12 +303,10 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
 #endif
   champlain_map_source_factory_register (factory, &MFF_RELIEF_DESC,
       MFF_RELIEF_DESC.constructor, MFF_RELIEF_DESC.data);
-#ifdef MEMPHIS_ENABLED
   champlain_map_source_factory_register (factory, &MEMPHIS_LOCAL_DESC,
       MEMPHIS_LOCAL_DESC.constructor, MEMPHIS_LOCAL_DESC.data);
   champlain_map_source_factory_register (factory, &MEMPHIS_NETWORK_DESC,
       MEMPHIS_NETWORK_DESC.constructor, MEMPHIS_NETWORK_DESC.data);
-#endif
 }
 
 /**
@@ -420,7 +414,6 @@ champlain_map_source_new_generic (
       desc->uri_format));
 }
 
-#ifdef MEMPHIS_ENABLED
 static ChamplainMapSource *
 champlain_map_source_new_memphis (ChamplainMapSourceDesc *desc,
     gpointer user_data)
@@ -447,4 +440,3 @@ champlain_map_source_new_memphis (ChamplainMapSourceDesc *desc,
   return CHAMPLAIN_MAP_SOURCE (champlain_memphis_map_source_new_full (
       desc, map_data_source));
 }
-#endif
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index b98e9df..972178f 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -73,10 +73,8 @@ champlain_map_source_factory_register (ChamplainMapSourceFactory *factory,
 #define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "osm-transportmap"
 #define CHAMPLAIN_MAP_SOURCE_OAM "oam"
 #define CHAMPLAIN_MAP_SOURCE_MFF_RELIEF "mff-relief"
-#ifdef MEMPHIS_ENABLED
 #define CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL "memphis-local"
 #define CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK "memphis-network"
-#endif
 
 G_END_DECLS
 
diff --git a/champlain/champlain.h b/champlain/champlain.h
index b03de4c..9ae37e1 100644
--- a/champlain/champlain.h
+++ b/champlain/champlain.h
@@ -41,13 +41,11 @@
 #include "champlain/champlain-map-source-factory.h"
 #include "champlain/champlain-network-map-source.h"
 #include "champlain/champlain-version.h"
-#ifdef MEMPHIS_ENABLED
 #include "champlain/champlain-memphis-map-source.h"
 #include "champlain/champlain-map-data-source.h"
 #include "champlain/champlain-local-map-data-source.h"
 #include "champlain/champlain-network-map-data-source.h"
 #include "champlain/champlain-bounding-box.h"
-#endif
 
 #undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__