X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=d4014fcb62971f5df8ef4f2dcf4d6f3a513f593e;hb=081bee01cb139925c43479801863f5d87caa7f2d;hp=5d57356ed15d79f72276945cbed81e89446c54a2;hpb=3242e69dd21cc00458447c231ef63f876ea54ad1;p=YACASL2.git

diff --git a/Makefile b/Makefile
index 5d57356..d4014fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
-.PHONY: all build gtags check doc info html doc-inner install uninstall install-info uninstall-info install-casl2lib uninstall-casl2lib version clean clean-src clean-gtags clean-test clean-doc clean-doc-inner
-
-GTAGS ?= gtags
-RMF ?= rm -f
-WHICH ?= which
-ECHO ?= echo
-INSTALL ?= install
-SED ?= sed
-CAT ?= cat
+.PHONY: all build gtags check doc info html doc-inner install uninstall install-info uninstall-info install-casl2lib uninstall-casl2lib version gittag clean clean-src clean-gtags clean-test clean-doc clean-doc-inner
+
+GTAGS := gtags
+RMF := rm -f
+WHICH := which
+ECHO := echo
+INSTALL := install
+SED := sed
+CAT := cat
+XARGS := xargs
+GITTAG := git tag
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
-casl2libdir ?= $(prefix)/lib/casl2
 
+VERSION = $(shell $(CAT) VERSION)
 VERSIONFILES = include/package.h test/system/casl2/opt_v/0.txt test/system/comet2/opt_v/0.txt test/system/dumpword/opt_v/0.txt
 
-all: build info html gtags
+all: build docall gtags
 
 build:
 	$(MAKE) -C src all
@@ -22,7 +24,7 @@ build:
 gtags:
 	@$(WHICH) $(GTAGS) >/dev/null && $(GTAGS) || $(ECHO) "$(GTAGS): not found"
 
-docall: doc
+docall:
 	$(MAKE) -C doc all
 
 info:
@@ -48,19 +50,22 @@ install-info:
 	$(MAKE) -C doc install-info
 
 uninstall-info:
-	@$(MAKE) -C doc uninstall-info
+	$(MAKE) -C doc uninstall-info
 
 install-casl2lib:
 	$(MAKE) -C as/casl2lib install-casl2lib
 
 uninstall-casl2lib:
-	@$(MAKE) -C as/casl2lib uninstall-casl2lib
+	$(MAKE) -C as/casl2lib uninstall-casl2lib
 
-version: VERSION $(VERSIONFILES)
-	@$(ECHO) "YACASL2 Version:" `$(CAT) VERSION`
+version: $(VERSIONFILES)
+	@$(ECHO) "YACASL2 Version: $(VERSION)"
 
 $(VERSIONFILES): VERSION
-	$(SED) -e "s/@@VERSION@@/`cat VERSION`/g" $@.version >$@
+	$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
+
+gittag: VERSION
+	$(GITTAG) $(VERSION)
 
 clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version