summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-23 12:31:44 +0200
committerBastien Guerry <bzg@altern.org>2012-08-23 12:31:44 +0200
commit85d6b781e49f5e8c674c02b3c06b2ff1cde99f84 (patch)
treee4624e8893ae0b2bf3ded59a36b428a855f6c469
parentddcf4f851154e8b13065cb8de162470827b04ca1 (diff)
downloadorg-mode-85d6b781e49f5e8c674c02b3c06b2ff1cde99f84.tar.gz
Revert "server.mk: implement `cleanrel´ here"
This reverts commit ddcf4f851154e8b13065cb8de162470827b04ca1.
-rw-r--r--UTILITIES/server.mk6
-rw-r--r--targets.mk9
2 files changed, 8 insertions, 7 deletions
diff --git a/UTILITIES/server.mk b/UTILITIES/server.mk
index be8aee4..9f1edb1 100644
--- a/UTILITIES/server.mk
+++ b/UTILITIES/server.mk
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
# This file is used for maintenance of org on the server.
#----------------------------------------------------------------------
-.PHONY: helpserver release rel-dirty cleanrel tagwarn
+.PHONY: helpserver release rel-dirty tagwarn
help helpall helpserver::
$(info )
@@ -59,7 +59,3 @@ tagwarn:
$(info = =)
$(info ======================================================)
@echo ""
-
-clean: cleanrel
-cleanrel:
- $(RM) org-7.* org-20??????*
diff --git a/targets.mk b/targets.mk
index 1619862..c1c6c42 100644
--- a/targets.mk
+++ b/targets.mk
@@ -27,7 +27,7 @@ endif
check test install $(INSTSUB) \
info html pdf card refcard doc docs \
autoloads cleanall clean $(CLEANDIRS:%=clean%) \
- clean-install cleanelc cleandirs \
+ cleanrel clean-install cleanelc cleandirs \
cleanlisp cleandoc cleandocs cleantest \
compile compile-dirty uncompiled \
config config-test config-exe config-all config-eol
@@ -118,7 +118,7 @@ autoloads: lisp
cleandirs:
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) cleanall;)
-clean: cleanlisp cleandoc
+clean: cleanrel cleanlisp cleandoc
cleanall: cleandirs cleantest
-$(FIND) . \( -name \*~ -o -name \*# -o -name .#\* \) -exec $(RM) {} \;
@@ -129,6 +129,11 @@ $(CLEANDIRS:%=clean%):
cleanutils: cleanUTILITIES
+cleanrel:
+ $(RMR) RELEASEDIR
+ $(RMR) org-7.*
+ $(RMR) org-7*zip org-7*tar.gz
+
cleanelc:
$(MAKE) -C lisp $@