Makefile: Re-order the commands in "make release" slightly.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index e828181663d2fc19a3280fe96331e49ac676b696..8207228476c2ab4cf0f7b7df0dd8919fef7da757 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -69,25 +69,22 @@ dist: $(TAR_FILE)
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
 .PHONY: release
-release:
+release: verify-version
        $(MAKE) test
-       $(MAKE) release-verify-newer
-       $(MAKE) release-upload
+       $(MAKE) $(GPG_FILE)
+       $(MAKE) verify-newer
+       scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+       ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
+       mkdir -p releases
+       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+       git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
+       git push origin $(VERSION)
        @echo "Please send a release announcement as follows:"
        @echo ""
        $(MAKE) release-message
        $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce
        @echo "(This message is also available in $(PACKAGE)-$(VERSION).announce"
 
-.PHONY: release-upload
-release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
-       mkdir -p releases
-       scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
-       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
-       ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-       git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
-       git push origin $(VERSION)
-
 .PHONY: release-message
 release-message:
        @echo "To: notmuch@notmuchmail.org"
@@ -120,8 +117,8 @@ release-message:
        @echo "For more about notmuch, see http://notmuchmail.org"
 
 
-.PHONY: release-verify-version
-release-verify-version:
+.PHONY: verify-version
+verify-version:
        @echo -n "Checking that $(VERSION) is a two-component version..."
        @if echo $(VERSION) | grep -q -v -x '[0-9]*\.[0-9]*'; then \
                (echo "Ouch." && \
@@ -129,8 +126,8 @@ release-verify-version:
         else :; fi
        @echo "Good."
 
-.PHONY: release-verify-newer
-release-verify-newer: release-verify-version
+.PHONY: verify-newer
+verify-newer:
        @echo -n "Checking that no $(VERSION) release already exists..."
        @ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \
                || (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \