packaging: Add `make clean`

6 files changed, 29 insertions, 15 deletions

diff --git a/packaging/Makefile b/packaging/Makefile
index 85eacddc1a..edb876770f 100644
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -41,6 +41,7 @@ all: packages
 PACKAGES_DIR ?= ../PACKAGES
 SOURCE_DIST_FILE ?= $(wildcard $(PACKAGES_DIR)/rabbitmq-server-*.tar.xz)
 
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -53,6 +54,7 @@ endif
 ifeq ($(wildcard $(SOURCE_DIST_FILE)),)
 $(error The source archive must exist)
 endif
+endif
 
 ifndef NO_CLEAN
 DO_CLEAN := clean
@@ -108,3 +110,10 @@ package-standalone-macosx: $(SOURCE_DIST_FILE)
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
 		all $(DO_CLEAN)
 endif
+
+.PHONY: clean
+
+clean:
+	for subdir in debs/Debian RPMS/Fedora windows windows-exe generic-unix standalone; do \
+		$(MAKE) -C "$$subdir" clean; \
+	done
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 9b2061b47a..5763cadf04 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 TOP_DIR = $(shell pwd)
 # Under debian we do not want to check build dependencies, since that
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 8328660ae7..a35b869d4f 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 DEBIAN_ORIG_TARBALL = rabbitmq-server_$(VERSION).orig.tar.xz
 UNPACKED_DIR = rabbitmq-server-$(VERSION)
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 8f16033a8f..fb8b3a9e68 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
@@ -48,4 +51,4 @@ clean: clean_partial
 	rm -f rabbitmq-server-generic-unix-*.tar.gz
 
 clean_partial:
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
+	rm -rf rabbitmq-server-* rabbitmq_server-*
diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile
index 5f2cb90440..578ed57345 100644
--- a/packaging/standalone/Makefile
+++ b/packaging/standalone/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR=rabbitmq-server-$(VERSION)
 TARGET_DIR=rabbitmq_server-$(VERSION)
@@ -92,19 +95,14 @@ dist:
 	cd $(TARGET_DIR)/release && \
 		find $(TARGET_DIR) -print0 | LC_COLLATE=C sort -z | \
 		xargs -0 tar -cnf - | xz > $(CURDIR)/$(TARGET_TARBALL).tar.xz
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
 	if test "$(PACKAGES_DIR)"; then \
 		mkdir -p "$(PACKAGES_DIR)"; \
 		mv $(TARGET_TARBALL).tar.xz "$(PACKAGES_DIR)"; \
 	fi
 
-clean: clean_partial
-	rm -f rabbitmq-server-$(OS)-standalone-*.tar.gz
-
-clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+clean:
+	rm -rf rabbitmq-server-* rabbitmq_server-*
 
 .PHONY : generate_release
 generate_release:
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 4fc72b95c4..beda5752be 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
@@ -30,16 +33,11 @@ dist:
 	cp -a README-etc $(TARGET_DIR)/etc/README.txt
 
 	zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
 	if test "$(PACKAGES_DIR)"; then \
 		mkdir -p "$(PACKAGES_DIR)"; \
 		mv $(TARGET_ZIP).zip "$(PACKAGES_DIR)"; \
 	fi
 
-clean: clean_partial
-	rm -f rabbitmq-server-windows-*.zip
-
-clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+clean:
+	rm -rf rabbitmq-server-* rabbitmq_server-*