[make] don't install addon data of disabled addons

1 files changed, 27 insertions, 3 deletions

diff --git a/Makefile.in b/Makefile.in
index c9113603b9..8162f645ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,9 @@
 include bootstrap.mk
 
+null :=
+space := ${null} ${null}
+${space} := ${space}
+
 AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@
 
 EC_DIRS= \
@@ -123,6 +127,9 @@ ifeq (@USE_MDNSEMBEDDED@,1)
 DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a
 endif
 
+INSTALL_FILTER = .*visualization\.dxspectrum.*
+INSTALL_FILTER += .*visualization\.milkdrop.*
+
 ifeq ($(findstring osx,@ARCH@),osx)
 DIRECTORY_ARCHIVES += xbmc/osx/osx.a
 DIRECTORY_ARCHIVES += xbmc/network/osx/network.a
@@ -130,7 +137,13 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
 DIRECTORY_ARCHIVES += xbmc/powermanagement/osx/powermanagement.a
 DIRECTORY_ARCHIVES += xbmc/storage/osx/storage.a
 DIRECTORY_ARCHIVES += xbmc/windowing/osx/windowing_osx.a
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
 else
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.*
 ifeq (@USE_ANDROID@,1)
 DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
 DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
@@ -145,6 +158,7 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
 DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a
 DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
 DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
 endif
 endif
 
@@ -207,6 +221,8 @@ endif
 SS_DIRS=
 ifneq (@DISABLE_RSXS@,1)
   SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+else
+  INSTALL_FILTER+= .*screensaver\.rsxs.*
 endif
 
 ifneq (@DISABLE_SPECTRUM@,1)
@@ -217,18 +233,26 @@ endif
 
 ifneq (@DISABLE_WAVEFORM@,1)
   VIS_DIRS+= xbmc/visualizations/WaveForm
+else
+  INSTALL_FILTER+= .*visualization\.waveform.*
 endif
 
 ifneq (@DISABLE_FISHBMC@,1)
   VIS_DIRS+= xbmc/visualizations/fishBMC
+else
+  INSTALL_FILTER+= .*visualization\.fishbmc.*
 endif
 
 ifneq (@DISABLE_PROJECTM@,1)
   VIS_DIRS+= xbmc/visualizations/XBMCProjectM
+else
+  INSTALL_FILTER+= .*visualization\.projectm.*
 endif
 
 ifneq (@DISABLE_GOOM@,1)
   VIS_DIRS+=xbmc/visualizations/Goom
+else
+  INSTALL_FILTER+= .*visualization\.goom.*
 endif
 
 LIBADDON_DIRS=\
@@ -572,7 +596,7 @@ install-datas: install-scripts
 	@# Arch independent files
 ifeq ($(findstring bsd,@ARCH@), bsd)
 	@find -E addons language media sounds userdata system -type f \
-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
 		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
 		-and \
 		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
@@ -580,13 +604,13 @@ ifeq ($(findstring bsd,@ARCH@), bsd)
 else
 ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
 	@find -E addons language media sounds userdata system -type f \
-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
 		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
 		-and \
 		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
 		-exec printf " -- %-75.75s\r" "{}" \;
 else
-	@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+	@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
 endif
 endif
 	@# Icons and links