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>

Author: hyperair

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

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
-

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

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
 

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
 

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
 

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

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

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

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