Improve make clean

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

11 files changed, 55 insertions, 22 deletions

diff --git a/saucy-arm64-nano/Makefile b/saucy-arm64-nano/Makefile
index 996e6c4..efd54c8 100755
--- a/saucy-arm64-nano/Makefile
+++ b/saucy-arm64-nano/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-nano-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-saucy-nano
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/saucy-armhf-developer/Makefile b/saucy-armhf-developer/Makefile
index e102184..f0ccf03 100755
--- a/saucy-armhf-developer/Makefile
+++ b/saucy-armhf-developer/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-developer-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-saucy-developer
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/saucy-armhf-nano-lava/Makefile b/saucy-armhf-nano-lava/Makefile
index 4de1557..a178b32 100755
--- a/saucy-armhf-nano-lava/Makefile
+++ b/saucy-armhf-nano-lava/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-nano-lava-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-saucy-nano-lava
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/saucy-armhf-nano/Makefile b/saucy-armhf-nano/Makefile
index 996e6c4..efd54c8 100755
--- a/saucy-armhf-nano/Makefile
+++ b/saucy-armhf-nano/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-nano-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-saucy-nano
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/saucy-armhf-server/Makefile b/saucy-armhf-server/Makefile
index 4b2036e..905cbe3 100755
--- a/saucy-armhf-server/Makefile
+++ b/saucy-armhf-server/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-server-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-saucy-server
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/saucy-armhf-ubuntu-desktop/Makefile b/saucy-armhf-ubuntu-desktop/Makefile
index a9e6c5d..0529cd6 100755
--- a/saucy-armhf-ubuntu-desktop/Makefile
+++ b/saucy-armhf-ubuntu-desktop/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-saucy-ubuntu-desktop-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-ubuntu-desktop
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/trusty-arm64-nano/Makefile b/trusty-arm64-nano/Makefile
index cdca2b5..1f7c823 100755
--- a/trusty-arm64-nano/Makefile
+++ b/trusty-arm64-nano/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-trusty-nano-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-nano
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/trusty-armhf-developer/Makefile b/trusty-armhf-developer/Makefile
index b61958f..9ee606a 100755
--- a/trusty-armhf-developer/Makefile
+++ b/trusty-armhf-developer/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-trusty-developer-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-developer
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/trusty-armhf-nano-lava/Makefile b/trusty-armhf-nano-lava/Makefile
index 7f336f0..e7bbe75 100755
--- a/trusty-armhf-nano-lava/Makefile
+++ b/trusty-armhf-nano-lava/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-trusty-nano-lava-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-nano-lava
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/trusty-armhf-nano/Makefile b/trusty-armhf-nano/Makefile
index cdca2b5..1f7c823 100755
--- a/trusty-armhf-nano/Makefile
+++ b/trusty-armhf-nano/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-trusty-nano-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-nano
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config
diff --git a/trusty-armhf-server/Makefile b/trusty-armhf-server/Makefile
index d98e7c5..2dcdb41 100755
--- a/trusty-armhf-server/Makefile
+++ b/trusty-armhf-server/Makefile
@@ -7,7 +7,9 @@
 
 # You need live-build package installed and superuser privileges.
 
-IMAGEPREFIX=linaro-trusty-server-`date +%Y%m%d`-$(BUILD_NUMBER)
+BUILD_NUMBER?=1
+BASEIMG=linaro-trusty-server
+IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER)
 LOGFILE=$(IMAGEPREFIX).build-log.txt
 CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2
 LISTFILE=$(IMAGEPREFIX).contents
@@ -29,4 +31,5 @@ all:
 
 clean:
 	sudo lb clean --purge
-	rm -f $(IMAGEPREFIX).*
+	rm -f $(BASEIMG)-*
+	rm -rf config