X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=8bd9f1ad71c1994ad7acdb7f7aff582316fbc63e;hb=0fb749ba4b6a216a79f15c2ce0c8246e1dae1eda;hp=7f9f0ea1406d30964246b7366d17280e98ca2ed6;hpb=e3db66c5d6baaf298b8449aaff25478b9814d246;p=YACASL2.git

diff --git a/Makefile b/Makefile
index 7f9f0ea..8bd9f1a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,22 +10,33 @@ CMD := casl2 comet2 dumpword
 
 CAT := cat
 CP := cp
-ECHO := echo
-GITTAG := git tag
+ECHO := /bin/echo
+GIT := git
+GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
 WHICH := which
+EXPR := expr
+XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
 
-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
+VERSION := $(shell $(CAT) VERSION)
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+
+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 doc gtags
 
-build: version
+build:
 	$(MAKE) -C src all
 	$(CP) $(addprefix src/,$(CMD)) ./
 
@@ -61,10 +72,10 @@ version: $(VERSIONFILES)
 $(VERSIONFILES): VERSION
 	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
-gittag: VERSION
-	$(GITTAG) $(VERSION)
+gittag:
+	if test `$(GIT) status -s | wc -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MASTERGITREF)"; then $(GIT) tag $(VERSION); fi
 
-distclean: cmd-clean gtags-clean version-clean clean
+distclean: cmd-clean src-distclean gtags-clean version-clean clean
 
 clean: src-clean doc-clean doc_inner-clean
 
@@ -74,6 +85,9 @@ cmd-clean:
 src-clean:
 	$(MAKE) -sC src clean
 
+src-distclean:
+	$(MAKE) -sC src distclean
+
 gtags-clean:
 	$(RM) GPATH GRTAGS GSYMS GTAGS