GNOME.org
 

[banshee] build: Move EXTRA_DIST away from build.rules.mk into build.dist.mk

commit 47ee25a2cb957be29bb10eda7e19c92f718ee598
Author: Chow Loong Jin <hyperair debian org>
Date:   Fri Jan 20 16:14:55 2012 +0800

    build: Move EXTRA_DIST away from build.rules.mk into build.dist.mk
    
    This allows for optional inclusion of build.rules.mk without needing to redefine
    EXTRA_DIST for the case where the include does not happen. Also fixes the issue
    where theme icons for $component don't appear in the tarball when
    --disable-$component happens.
    
    Signed-off-by: Bertrand Lorentz <bertrand lorentz gmail com>

 build/build.dist.mk                                |   22 ++++++++++++++++
 build/build.rules.mk                               |   26 ++-----------------
 src/Backends/Banshee.GStreamerSharp/Makefile.am    |    3 +-
 src/Backends/Banshee.Gio/Makefile.am               |    2 +-
 src/Backends/Banshee.Gnome/Makefile.am             |    2 +-
 src/Backends/Banshee.NowPlaying.X11/Makefile.am    |    2 +-
 src/Backends/Banshee.Osx/Makefile.am               |    2 +-
 src/Backends/Banshee.Windows/Makefile.am           |    4 +--
 src/Clients/MeeGo/Makefile.am                      |    2 +-
 src/Core/Banshee.WebBrowser/Makefile.am            |    2 +-
 src/Dap/Banshee.Dap.AppleDevice/Makefile.am        |    2 +-
 src/Dap/Banshee.Dap.Karma/Makefile.am              |    2 +-
 src/Dap/Banshee.Dap.Mtp/Makefile.am                |    2 +-
 src/Extensions/Banshee.AmazonMp3.Store/Makefile.am |    2 +-
 src/Extensions/Banshee.BooScript/Makefile.am       |    2 +-
 src/Extensions/Banshee.Daap/Makefile.am            |    2 +-
 src/Extensions/Banshee.Emusic.Store/Makefile.am    |    2 +-
 src/Extensions/Banshee.MeeGo/Makefile.am           |    8 +++---
 src/Extensions/Banshee.MiroGuide/Makefile.am       |    2 +-
 src/Extensions/Banshee.MultimediaKeys/Makefile.am  |    2 +-
 .../Banshee.NotificationArea/Makefile.am           |    5 ++-
 src/Extensions/Banshee.RemoteAudio/Makefile.am     |    2 +-
 src/Extensions/Banshee.Sample/Makefile.am          |    2 +-
 src/Extensions/Banshee.SoundMenu/Makefile.am       |    2 +-
 src/Extensions/Banshee.SqlDebugConsole/Makefile.am |    2 +-
 src/Extensions/Banshee.Torrent/Makefile.am         |    2 +-
 .../Banshee.UbuntuOneMusicStore/Makefile.am        |    2 +-
 src/Extensions/Banshee.Wikipedia/Makefile.am       |    2 +-
 src/Extensions/Banshee.YouTube/Makefile.am         |    2 +-
 src/Libraries/Mtp/Makefile.am                      |    8 ++----
 30 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/build/build.dist.mk b/build/build.dist.mk
new file mode 100644
index 0000000..d9be83d
--- /dev/null
+++ b/build/build.dist.mk
@@ -0,0 +1,22 @@
+SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
+SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
+
+RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+	-resource:$(resource),$(notdir $(resource)))
+
+THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
+THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+
+ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
+ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+
+OUTPUT_FILES = \
+	$(ASSEMBLY_FILE) \
+	$(ASSEMBLY_FILE).mdb
+
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+
+CLEANFILES = $(OUTPUT_FILES)
+DISTCLEANFILES = *.pidb
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 348e7cd..c387972 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -1,19 +1,9 @@
+include $(top_srcdir)/build/build.dist.mk
+
 UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
 BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
 
-SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
-SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
-
-RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
-	-resource:$(resource),$(notdir $(resource)))
-
 INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
-THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
-THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
-
-ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
-ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
@@ -25,16 +15,12 @@ endif
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
-OUTPUT_FILES = \
-	$(ASSEMBLY_FILE) \
-	$(ASSEMBLY_FILE).mdb
-
 moduledir = $(INSTALL_DIR_RESOLVED)
 module_SCRIPTS = $(OUTPUT_FILES)
 
 all: $(ASSEMBLY_FILE) theme-icons
 
-run: 
+run:
 	@pushd $(top_builddir); \
 	make run; \
 	popd;
@@ -80,9 +66,3 @@ uninstall-hook: $(THEME_ICONS_SOURCE)
 	@$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
 	$(EXTRA_UNINSTALL_HOOK)
 
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
-
-CLEANFILES = $(OUTPUT_FILES)
-DISTCLEANFILES = *.pidb
-MAINTAINERCLEANFILES = Makefile.in
-
diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.am b/src/Backends/Banshee.GStreamerSharp/Makefile.am
index a919d06..69424d7 100644
--- a/src/Backends/Banshee.GStreamerSharp/Makefile.am
+++ b/src/Backends/Banshee.GStreamerSharp/Makefile.am
@@ -20,7 +20,8 @@ include $(top_srcdir)/build/build.mk
 EXTRA_DIST += Banshee.GStreamerSharp.dll.config
 module_SCRIPTS += Banshee.GStreamerSharp.dll.config
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES) Banshee.GStreamerSharp.dll.config
+include $(top_srcdir)/build/build.dist.mk
+EXTRA_DIST += Banshee.GStreamerSharp.dll.config
 endif
 
 if ENABLE_GAPLESS
diff --git a/src/Backends/Banshee.Gio/Makefile.am b/src/Backends/Banshee.Gio/Makefile.am
index 1291cc8..87d6428 100644
--- a/src/Backends/Banshee.Gio/Makefile.am
+++ b/src/Backends/Banshee.Gio/Makefile.am
@@ -53,6 +53,6 @@ define EXTRA_UNINSTALL_HOOK
 	done;
 endef
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Backends/Banshee.Gnome/Makefile.am b/src/Backends/Banshee.Gnome/Makefile.am
index a06dbc9..4a1b0bc 100644
--- a/src/Backends/Banshee.Gnome/Makefile.am
+++ b/src/Backends/Banshee.Gnome/Makefile.am
@@ -18,6 +18,6 @@ RESOURCES =  \
 if ENABLE_GNOME
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.am b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
index 745ee74..d8e94fd 100644
--- a/src/Backends/Banshee.NowPlaying.X11/Makefile.am
+++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
@@ -12,6 +12,6 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
 if HAVE_XVIDMODE
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Backends/Banshee.Osx/Makefile.am b/src/Backends/Banshee.Osx/Makefile.am
index 9c71e4d..9a5fb23 100644
--- a/src/Backends/Banshee.Osx/Makefile.am
+++ b/src/Backends/Banshee.Osx/Makefile.am
@@ -36,7 +36,7 @@ define EXTRA_UNINSTALL_HOOK
 endef
 
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/Backends/Banshee.Windows/Makefile.am b/src/Backends/Banshee.Windows/Makefile.am
index 3bd5b5a..16a99d1 100644
--- a/src/Backends/Banshee.Windows/Makefile.am
+++ b/src/Backends/Banshee.Windows/Makefile.am
@@ -14,6 +14,4 @@ SOURCES =  \
 
 RESOURCES = Banshee.Windows.addin.xml
 
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
-
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/build/build.dist.mk
diff --git a/src/Clients/MeeGo/Makefile.am b/src/Clients/MeeGo/Makefile.am
index 79b97fd..12f931f 100644
--- a/src/Clients/MeeGo/Makefile.am
+++ b/src/Clients/MeeGo/Makefile.am
@@ -6,5 +6,5 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
 if HAVE_MEEGO
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Core/Banshee.WebBrowser/Makefile.am b/src/Core/Banshee.WebBrowser/Makefile.am
index b1c0006..f524016 100644
--- a/src/Core/Banshee.WebBrowser/Makefile.am
+++ b/src/Core/Banshee.WebBrowser/Makefile.am
@@ -48,5 +48,5 @@ RESOURCES =  \
 if HAVE_LIBWEBKIT
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Makefile.am b/src/Dap/Banshee.Dap.AppleDevice/Makefile.am
index 8734841..b8a1921 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Makefile.am
+++ b/src/Dap/Banshee.Dap.AppleDevice/Makefile.am
@@ -27,6 +27,6 @@ define EXTRA_UNINSTALL_HOOK
 endef
 
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Dap/Banshee.Dap.Karma/Makefile.am b/src/Dap/Banshee.Dap.Karma/Makefile.am
index 2b9b1ae..f83b4a2 100644
--- a/src/Dap/Banshee.Dap.Karma/Makefile.am
+++ b/src/Dap/Banshee.Dap.Karma/Makefile.am
@@ -27,5 +27,5 @@ define EXTRA_UNINSTALL_HOOK
 endef
 
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Dap/Banshee.Dap.Mtp/Makefile.am b/src/Dap/Banshee.Dap.Mtp/Makefile.am
index 2e31ec5..cc81775 100644
--- a/src/Dap/Banshee.Dap.Mtp/Makefile.am
+++ b/src/Dap/Banshee.Dap.Mtp/Makefile.am
@@ -13,5 +13,5 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
 if ENABLE_MTP
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.am b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.am
index 0435529..de26dae 100644
--- a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.am
+++ b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.am
@@ -14,7 +14,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
 if HAVE_LIBWEBKIT
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
 EXTRA_DIST += ThemeIcons/amazon-mp3-store-source.svg
diff --git a/src/Extensions/Banshee.BooScript/Makefile.am b/src/Extensions/Banshee.BooScript/Makefile.am
index 234381c..81fc334 100644
--- a/src/Extensions/Banshee.BooScript/Makefile.am
+++ b/src/Extensions/Banshee.BooScript/Makefile.am
@@ -14,6 +14,6 @@ RESOURCES =  \
 if HAVE_BOO
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Extensions/Banshee.Daap/Makefile.am b/src/Extensions/Banshee.Daap/Makefile.am
index 4cb2e73..0bb6344 100644
--- a/src/Extensions/Banshee.Daap/Makefile.am
+++ b/src/Extensions/Banshee.Daap/Makefile.am
@@ -39,6 +39,6 @@ RESOURCES =  \
 if DAAP_ENABLED
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Extensions/Banshee.Emusic.Store/Makefile.am b/src/Extensions/Banshee.Emusic.Store/Makefile.am
index 17b8004..34833e5 100644
--- a/src/Extensions/Banshee.Emusic.Store/Makefile.am
+++ b/src/Extensions/Banshee.Emusic.Store/Makefile.am
@@ -13,5 +13,5 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
 if HAVE_LIBWEBKIT
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
index f58e90e..bb42b94 100644
--- a/src/Extensions/Banshee.MeeGo/Makefile.am
+++ b/src/Extensions/Banshee.MeeGo/Makefile.am
@@ -45,15 +45,15 @@ desktopfiles_DATA = $(desktopfiles_files)
 %.desktop.in: %.desktop.in.in Makefile
 	sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
+else
+include $(top_srcdir)/build/build.dist.mk
+endif
+
 clean-local:
 	rm -f com.meego.UX.Shell.Panels.banshee.service \
 		meego-panel-banshee.desktop \
 		meego-panel-banshee.desktop.in
 
-else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
-endif
-
 EXTRA_DIST += \
 	Banshee.MeeGo.dll.config \
 	meego-panel-banshee \
diff --git a/src/Extensions/Banshee.MiroGuide/Makefile.am b/src/Extensions/Banshee.MiroGuide/Makefile.am
index 8fa5cb1..6cf0451 100644
--- a/src/Extensions/Banshee.MiroGuide/Makefile.am
+++ b/src/Extensions/Banshee.MiroGuide/Makefile.am
@@ -12,5 +12,5 @@ RESOURCES = Banshee.MiroGuide.addin.xml
 if HAVE_LIBWEBKIT
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.MultimediaKeys/Makefile.am b/src/Extensions/Banshee.MultimediaKeys/Makefile.am
index 1cdde31..d16f95f 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Makefile.am
+++ b/src/Extensions/Banshee.MultimediaKeys/Makefile.am
@@ -10,5 +10,5 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
 if ENABLE_GNOME
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am b/src/Extensions/Banshee.NotificationArea/Makefile.am
index b499244..ef855bb 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -29,9 +29,10 @@ RESOURCES =  \
 	Resources/NotificationAreaMenu.xml
 
 if PLATFORM_DARWIN
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 else
 include $(top_srcdir)/build/build.mk
 module_SCRIPTS += Banshee.NotificationArea.dll.config
-EXTRA_DIST += Banshee.NotificationArea.dll.config $(SOURCES) $(RESOURCES)
 endif
+
+EXTRA_DIST += Banshee.NotificationArea.dll.config
diff --git a/src/Extensions/Banshee.RemoteAudio/Makefile.am b/src/Extensions/Banshee.RemoteAudio/Makefile.am
index a6f91f0..5830c6b 100644
--- a/src/Extensions/Banshee.RemoteAudio/Makefile.am
+++ b/src/Extensions/Banshee.RemoteAudio/Makefile.am
@@ -22,5 +22,5 @@ run:
 if REMOTE_AUDIO_ENABLED
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.Sample/Makefile.am b/src/Extensions/Banshee.Sample/Makefile.am
index 9c0642e..a0fccf3 100644
--- a/src/Extensions/Banshee.Sample/Makefile.am
+++ b/src/Extensions/Banshee.Sample/Makefile.am
@@ -9,7 +9,7 @@ SOURCES =  \
 
 RESOURCES = Banshee.Sample.addin.xml
 
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 
 # include $(top_srcdir)/build/build.mk
 
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
index cbe504c..4c7ac25 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.am
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -23,5 +23,5 @@ RESOURCES = Banshee.SoundMenu.addin.xml
 if ENABLE_SOUNDMENU
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.SqlDebugConsole/Makefile.am b/src/Extensions/Banshee.SqlDebugConsole/Makefile.am
index 40bb6c4..ea50375 100644
--- a/src/Extensions/Banshee.SqlDebugConsole/Makefile.am
+++ b/src/Extensions/Banshee.SqlDebugConsole/Makefile.am
@@ -9,6 +9,6 @@ RESOURCES =  \
 	Banshee.SqlDebugConsole.addin.xml \
 	Resources/GlobalUI.xml
 
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 
 #include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Banshee.Torrent/Makefile.am b/src/Extensions/Banshee.Torrent/Makefile.am
index b0d0047..77edc42 100644
--- a/src/Extensions/Banshee.Torrent/Makefile.am
+++ b/src/Extensions/Banshee.Torrent/Makefile.am
@@ -24,6 +24,6 @@ uninstall-hook:
 		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
 	done;
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
index 2873b5b..f65b477 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
@@ -12,5 +12,5 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
 if ENABLE_UBUNTUONE
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
diff --git a/src/Extensions/Banshee.Wikipedia/Makefile.am b/src/Extensions/Banshee.Wikipedia/Makefile.am
index 0ee4d6a..869001b 100644
--- a/src/Extensions/Banshee.Wikipedia/Makefile.am
+++ b/src/Extensions/Banshee.Wikipedia/Makefile.am
@@ -12,6 +12,6 @@ RESOURCES = Banshee.Wikipedia.addin.xml
 if HAVE_LIBWEBKIT
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES) $(shell find $(srcdir)/ThemeIcons -type f)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
diff --git a/src/Extensions/Banshee.YouTube/Makefile.am b/src/Extensions/Banshee.YouTube/Makefile.am
index 8ca149f..4ccd165 100644
--- a/src/Extensions/Banshee.YouTube/Makefile.am
+++ b/src/Extensions/Banshee.YouTube/Makefile.am
@@ -16,7 +16,7 @@ RESOURCES = Banshee.YouTube.addin.xml
 if HAVE_GDATA
 include $(top_srcdir)/build/build.mk
 else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
+include $(top_srcdir)/build/build.dist.mk
 endif
 
 if HAVE_GDATASHARP_1_5
diff --git a/src/Libraries/Mtp/Makefile.am b/src/Libraries/Mtp/Makefile.am
index 62f139f..d52fbc2 100644
--- a/src/Libraries/Mtp/Makefile.am
+++ b/src/Libraries/Mtp/Makefile.am
@@ -28,11 +28,9 @@ SOURCES =  \
 if ENABLE_MTP
 include $(top_srcdir)/build/build.mk
 module_SCRIPTS += Mtp.dll.config
-EXTRA_DIST += Mtp.dll.config.in
-DISTCLEANFILES += Mtp.dll.config
 else
-EXTRA_DIST = $(SOURCES) Mtp.dll.config.in
-DISTCLEANFILES = Mtp.dll.config
+include $(top_srcdir)/build/build.dist.mk
 endif
 
-
+EXTRA_DIST += Mtp.dll.config.in
+DISTCLEANFILES += Mtp.dll.config
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]