Distribute conditionally built files

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 80c9a792d9ca868466444ce5c137bb3064b7d336..c3d085fae55090410c85606873815995abecac0b 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -118,14 +118,6 @@ 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)
@@ -218,6 +210,18 @@ pkgconfig_DATA = libempathy-gtk.pc
 EXTRA_DIST =                   \
        $(ui_DATA)
 
+if HAVE_GEOCLUE
+libempathy_gtk_handwritten_source +=           \
+       empathy-location-manager.c
+
+libempathy_gtk_headers +=                      \
+       empathy-location-manager.h
+else
+EXTRA_DIST +=                                  \
+       empathy-location-manager.c              \
+       empathy-location-manager.h
+endif
+
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \
        stamp-empathy-gtk-enum-types.h

diff --git a/src/Makefile.am b/src/Makefile.am
index db21179869b6995f70e46e203ff6fa0d4dcf0def..8102666c68a60c4cb0d682aa8ba5ef9f555927ad 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,12 +75,22 @@ ui_DATA =                                   \
        empathy-preferences.ui                  \
        empathy-status-icon.ui
 
+EXTRA_DIST =                   \
+       $(autostart_DATA)       \
+       $(ui_DATA)
+
 if HAVE_LIBCHAMPLAIN
 empathy_SOURCES +=                             \
-       empathy-map-view.c empathy-map-view.h
+       empathy-map-view.c                      \
+       empathy-map-view.h
 
 ui_DATA +=                                     \
        empathy-map-view.ui
+else
+EXTRA_DIST +=                                  \
+       empathy-map-view.c                      \
+       empathy-map-view.h                      \
+       empathy-map-view.ui
 endif
 
 dist_man_MANS =                        \
@@ -104,9 +114,5 @@ dist_man_MANS =                     \
        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
        $< > $@
 
-EXTRA_DIST =                   \
-       $(autostart_DATA)       \
-       $(ui_DATA)
-
 CLEANFILES = $(BUILT_SOURCES)