[empathy] Don't build the file instead of #if the whole file



commit 7a1fd4ecfdb3af30a23b4cd028a5c7402f1f6a38
Author: Pierre-Luc Beaudoin <pierre-luc beaudoin collabora co uk>
Date:   Fri May 29 15:15:42 2009 -0400

    Don't build the file instead of #if the whole file
---
 libempathy-gtk/Makefile.am                |   10 ++++++++--
 libempathy-gtk/empathy-location-manager.c |    3 ---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index b31bd3f..4fd0fa5 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -47,7 +47,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-video-src.c			\
 	empathy-video-widget.c			\
 	empathy-irc-network-dialog.c		\
-	empathy-location-manager.c		\
 	empathy-log-window.c			\
 	empathy-new-message-dialog.c		\
 	empathy-presence-chooser.c		\
@@ -106,7 +105,6 @@ libempathy_gtk_headers =			\
 	empathy-video-widget.h			\
 	empathy-images.h			\
 	empathy-irc-network-dialog.h		\
-	empathy-location-manager.h		\
 	empathy-log-window.h			\
 	empathy-new-message-dialog.h		\
 	empathy-presence-chooser.h		\
@@ -119,6 +117,14 @@ libempathy_gtk_headers =			\
 	empathy-theme-manager.h			\
 	empathy-ui-utils.h
 
+if HAVE_GEOCLUE
+libempathy_gtk_handwritten_source +=		\
+	empathy-location-manager.c
+
+libempathy_gtk_headers +=			\
+	empathy-location-manager.h
+endif
+
 check_c_sources = \
     $(libempathy_gtk_handwritten_source) \
     $(libempathy_gtk_headers)
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 7009a91..5842e5f 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -28,7 +28,6 @@
 
 #include <telepathy-glib/util.h>
 
-#if HAVE_GEOCLUE
 #include <geoclue/geoclue-master.h>
 
 #include <extensions/extensions.h>
@@ -652,5 +651,3 @@ resource_cb (EmpathyConf  *conf,
   if (priv->is_setup)
     update_resources (manager);
 }
-
-#endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]