バージョン表示に関する修正

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index 6e145d7..d4014fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,30 @@
-.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
+.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)/yacasl2/casl2lib
 
+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: version
+build:
        $(MAKE) -C src all
 
 gtags:
        @$(WHICH) $(GTAGS) >/dev/null && $(GTAGS) || $(ECHO) "$(GTAGS): not found"
 
-docall: doc
+docall:
        $(MAKE) -C doc all
 
 info:
@@ -47,18 +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: $(VERSIONFILES)
+       @$(ECHO) "YACASL2 Version: $(VERSION)"
+
+$(VERSIONFILES): VERSION
+       $(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
-$(VERSIONFILES):
-       for f in $(VERSIONFILES); do $(SED) -e "s/@@VERSION@@/`cat VERSION`/g" $$f.version >$$f; done
+gittag: VERSION
+       $(GITTAG) $(VERSION)
 
 clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version