From 1b90b2ea10d7a0bed4a79faae0647be818f4e891 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Sat, 22 Aug 2009 17:13:50 +0200
Subject:   - rename stamp-* targets to *-stamp, merge stamp-extension-install
 into     xpi-install, merge xpi-clean into clean     - update src/xpi.mk

---
 src/xpi.mk | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/xpi.mk b/src/xpi.mk
index 68ea18d..f065915 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -182,14 +182,8 @@ endif
 
 install/$(MOZ_EXTENSION_PKG):: xpi-install
 
-# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined
-clean:: xpi-clean
-ifneq (,$(MOZ_XPI_BUILD_COMMAND))
-	rm -f *.xpi
-endif
-
 # ### general helper targets
-stamp-unzip-%: $(XPI_FILE)
+unzip-%-stamp: $(XPI_FILE)
 	[ -d $(TEMPDIR) ] || mkdir -p $(TEMPDIR)
 ifneq (,$(MOZ_XPI_DOCUMENTED_LICENSE_FILES))
 	unzip -d $(TEMPDIR) $(XPI_DIR)$* -x $(MOZ_XPI_DOCUMENTED_LICENSE_FILES)
@@ -198,34 +192,36 @@ else
 endif
 	touch $@
 
-stamp-installlinks-%:
+installlinks-%-stamp: unzip-$(XPI_BASE_FILE)-stamp
 	dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/$*/extensions/$(call XPI_EMID,$(TEMPDIR))
 	touch $@
 
-stamp-autolinks: $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),stamp-installlinks-$(mozilla))
+autolinks-stamp: unzip-$(XPI_BASE_FILE)-stamp $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),installlinks-$(mozilla)-stamp)
 	$(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)),dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/mozilla/extensions/$(id)/$(call XPI_EMID,$(TEMPDIR));)
 	touch $@
 
-stamp-install-%: stamp-autolinks
+install-%-stamp: unzip-%-stamp
 	dh_install -p$(MOZ_EXTENSION_PKG) $(wildcard $(TEMPDIR)/*) /usr/share/$(MOZ_EXTENSION_PKG)
 	touch $@
 
-stamp-extension-install: stamp-unzip-$(XPI_BASE_FILE) stamp-install-$(XPI_BASE_FILE)
-	touch $@
-
-stamp-xpi-depends:
+xpi-depends-stamp: unzip-$(XPI_BASE_FILE)-stamp
 	if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then grep -v ^xpi:Depends= debian/$(MOZ_EXTENSION_PKG).substvars > debian/$(MOZ_EXTENSION_PKG).substvars~; fi
 	echo "xpi:Depends=$(XPI_DEPENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars~
 	mv debian/$(MOZ_EXTENSION_PKG).substvars~ debian/$(MOZ_EXTENSION_PKG).substvars
 	touch $@
 
-xpi-install: stamp-extension-install stamp-xpi-depends
+xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-depends-stamp
 
-xpi-clean:
+# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined
+clean::
+	dh_testdir
 	dh_clean
-	-rm -f stamp-extension-install \
-		stamp-* \
-		$(NULL)
-	-rm -rf $(TEMPDIR)
+	rm -rf $(TEMPDIR)
+ifeq ($(shell expr $(shell cat debian/compat) '<' 7),1)
+	rm -f *-stamp
+endif
+ifneq (,$(MOZ_XPI_BUILD_COMMAND))
+	rm -f *.xpi
+endif
 
-.PHONY: xpi-install xpi-clean
+.PHONY: clean xpi-install
-- 
cgit v1.2.3