Merge pull request #10257 from hudokkow/cmake_addons_clean

9 files changed, 27 insertions, 27 deletions

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 8682b0641b..66523e47e3 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -9,7 +9,7 @@ OBJS = libcurl.so \
 PLATFORM_OBJS =
 EXCLUDED_ADDONS = 
 
-XBMCROOT = $(shell cd $(CURDIR)/../../..; pwd)
+CORE_SOURCE_DIR = $(shell cd $(CURDIR)/../../..; pwd)
 COPYDIRS = system addons media
 GCC_VERSION=$(shell $(CC) -dumpversion)
 ZIP=zip
@@ -80,15 +80,15 @@ shared:
 	find `pwd`/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \;
 	cd `pwd`/assets/addons; rm -rf $(EXCLUDED_ADDONS)
 	mkdir -p assets/system/certs
-	cp $(XBMCROOT)/tools/depends/target/openssl/cacert.pem assets/system/certs
+	cp $(CORE_SOURCE_DIR)/tools/depends/target/openssl/cacert.pem assets/system/certs
 
 sharedapk: shared | xbmc/assets
 	cp -rfp assets/* ./xbmc/assets
 
 sharedobb: shared
-	rm -f $(XBMCROOT)/main.@APP_NAME_LC@.obb
-	$(ZIP) -9 -q -r $(XBMCROOT)/main.@APP_NAME_LC@.obb assets
-	@echo "$(XBMCROOT)/main.@APP_NAME_LC@.obb created"
+	rm -f $(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb
+	$(ZIP) -9 -q -r $(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb assets
+	@echo "$(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb created"
 
 python: | xbmc/assets
 	mkdir -p xbmc/assets/python2.7/lib/
@@ -98,7 +98,7 @@ python: | xbmc/assets
 res:
 	mkdir -p xbmc/res xbmc/res/raw xbmc/res/values images
 	@echo "native_arch=$(ARCH)" > xbmc/res/raw/xbmc.properties
-	cp -fp $(XBMCROOT)/media/Splash.png xbmc/res/drawable/splash.png
+	cp -fp $(CORE_SOURCE_DIR)/media/Splash.png xbmc/res/drawable/splash.png
 	cp -fp media/drawable-hdpi/ic_launcher.png xbmc/res/drawable-hdpi/ic_launcher.png
 	cp -fp media/drawable-ldpi/ic_launcher.png xbmc/res/drawable-ldpi/ic_launcher.png
 	cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png
@@ -125,7 +125,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
 	install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver
 	echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup
 	echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \
-	     "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include $(XBMCROOT)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
+	     "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include $(CORE_SOURCE_DIR)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
 	cp -fp xbmc/libs/$(CPU)/* xbmc/lib/$(CPU)
 
 xbmc/classes.dex: res
@@ -142,9 +142,9 @@ package: libs python xbmc/classes.dex
 apk-sign:
 	@echo "Signing..."
 	@jarsigner -sigalg MD5withRSA -digestalg SHA1 -keystore $(SIGN_STORE) -storepass $(SIGN_STOREPASS) $(SIGN_KEYPASS_OPT) images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(SIGN_KEY)
-	@$(ZIPALIGN) -f 4 images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(XBMCROOT)/@APP_NAME_LC@app-$(CPU)-debug.apk
+	@$(ZIPALIGN) -f 4 images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(CORE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk
 	@rm images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk
-	@echo "$(XBMCROOT)/@APP_NAME_LC@app-$(CPU)-debug.apk created"
+	@echo "$(CORE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk created"
 
 $(PREFIX)/lib/xbmc/lib@APP_NAME_LC@.so: $(SRCLIBS)
 	$(MAKE) -C ../../depends/target/xbmc
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in
index 8b4b291c9e..c023f961ff 100644
--- a/tools/depends/Makefile.include.in
+++ b/tools/depends/Makefile.include.in
@@ -3,7 +3,7 @@ abs_top_srcdir=@abs_top_srcdir@
 TOOLCHAIN=@use_toolchain@
 NDKROOT=@use_ndk@
 SDKROOT=@use_sdk_path@
-XBMCROOT=$(abspath $(abs_top_srcdir)/../../)
+CORE_SOURCE_DIR=$(abspath $(abs_top_srcdir)/../../)
 TARBALLS_LOCATION=@use_tarballs@
 PLATFORM=@deps_dir@
 HOST=@use_host@
diff --git a/tools/depends/native/TexturePacker/Makefile b/tools/depends/native/TexturePacker/Makefile
index d128d74132..f83e031e22 100644
--- a/tools/depends/native/TexturePacker/Makefile
+++ b/tools/depends/native/TexturePacker/Makefile
@@ -21,8 +21,8 @@ ifeq ($(NATIVE_OS), android)
   EXTRA_CONFIGURE = --enable-static
 endif
 
-ifeq ($(XBMCROOT),)
-  XBMCROOT = $(ROOT_DIR)/../../../..
+ifeq ($(CORE_SOURCE_DIR),)
+  CORE_SOURCE_DIR = $(ROOT_DIR)/../../../..
 endif
 
 SOURCE=$(ROOT_DIR)/src
@@ -46,11 +46,11 @@ $(APP): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM) install
 	touch $@
 	#TEMP workaround for skins: create legacy link. Remove me when skins are fixed
-	@mkdir -p $(XBMCROOT)/tools/TexturePacker
-	@[ -f $(XBMCROOT)/tools/TexturePacker/TexturePacker ] && rm $(XBMCROOT)/tools/TexturePacker/TexturePacker || :
-	@ln -sf $(APPBIN) $(XBMCROOT)/tools/TexturePacker/TexturePacker
-	@echo "all:" > $(XBMCROOT)/tools/TexturePacker/Makefile
-	@echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(XBMCROOT)/tools/TexturePacker/Makefile
+	@mkdir -p $(CORE_SOURCE_DIR)/tools/TexturePacker
+	@[ -f $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker ] && rm $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker || :
+	@ln -sf $(APPBIN) $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker
+	@echo "all:" > $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile
+	@echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile
 
 clean:
 	$(MAKE) -C $(PLATFORM) clean
diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile
index a5a0220f29..43d8224adb 100644
--- a/tools/depends/target/boblight/Makefile
+++ b/tools/depends/target/boblight/Makefile
@@ -51,7 +51,7 @@ endif
 ifeq ($(OS),ios)
 ifeq ($(TARGET_PLATFORM),appletvos)
 	#deploy into source tree for tvos - we distribute libboblight with the bundle...
-	cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(XBMCROOT)/system/libboblight-tvos.0.dylib
+	cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(CORE_SOURCE_DIR)/system/libboblight-tvos.0.dylib
 endif
 else
 	echo "libboblight isn't a dependency of XBMC and won't be installed"
diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile
index 1b3207eafa..8004712be2 100644
--- a/tools/depends/target/cmakebuildsys/Makefile
+++ b/tools/depends/target/cmakebuildsys/Makefile
@@ -1,14 +1,14 @@
 -include ../../Makefile.include
 
-VERSION.TXT := $(XBMCROOT)/version.txt
+VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 all:
-	mkdir -p $(XBMCROOT)/build
-	cd $(XBMCROOT)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) $(XBMCROOT)/project/cmake
+	mkdir -p $(CORE_SOURCE_DIR)/build
+	cd $(CORE_SOURCE_DIR)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) $(CORE_SOURCE_DIR)/project/cmake
 
 clean:
-	cd $(XBMCROOT)/build; $(MAKE) clean
+	cd $(CORE_SOURCE_DIR)/build; $(MAKE) clean
 
 distclean:
-	cd $(XBMCROOT)/build; $(MAKE) clean
+	cd $(CORE_SOURCE_DIR)/build; $(MAKE) clean
diff --git a/tools/depends/target/dummy-libxbmc/Makefile b/tools/depends/target/dummy-libxbmc/Makefile
index d65537aad6..06524c4626 100644
--- a/tools/depends/target/dummy-libxbmc/Makefile
+++ b/tools/depends/target/dummy-libxbmc/Makefile
@@ -1,5 +1,5 @@
 include ../../Makefile.include
-VERSION.TXT := $(XBMCROOT)/version.txt
+VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
 DEPS= ../../Makefile.include Makefile dummy-libxbmc.c $(VERSION.TXT)
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile
index f32396d029..610961bec5 100644
--- a/tools/depends/target/pythonmodule-pil/Makefile
+++ b/tools/depends/target/pythonmodule-pil/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.include
 DEPS= ../../Makefile.include Makefile pillow-crosscompile.patch
 
-VERSION.TXT := $(XBMCROOT)/version.txt
+VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 # lib name, version
diff --git a/tools/depends/target/pythonmodule-setuptools/Makefile b/tools/depends/target/pythonmodule-setuptools/Makefile
index 89af2397b9..60896aa5f1 100644
--- a/tools/depends/target/pythonmodule-setuptools/Makefile
+++ b/tools/depends/target/pythonmodule-setuptools/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.include
 DEPS= ../../Makefile.include Makefile #pillow-crosscompile.patch
 
-VERSION.TXT := $(XBMCROOT)/version.txt
+VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 # lib name, version
diff --git a/tools/depends/target/xbmc/Makefile b/tools/depends/target/xbmc/Makefile
index 2870fa8c9c..b370c6d4b2 100644
--- a/tools/depends/target/xbmc/Makefile
+++ b/tools/depends/target/xbmc/Makefile
@@ -1,6 +1,6 @@
 -include ../../Makefile.include
 
-VERSION.TXT := $(XBMCROOT)/version.txt
+VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 SOURCE=../../../../