X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=Makefile;h=7222401dabeee071d57cdac7b7c05b3b8e39ea03;hp=ad22d42f5e74133dbfd0f3535ea4a815df9b55ad;hb=7fbde1700bbe9d8f779033ad3b842d3dceb3e1c6;hpb=19875f416e24340460868fbc4e09ed2c8faaa127

diff --git a/Makefile b/Makefile
index ad22d42..7222401 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,73 @@
 .PHONY: all build gtags \
         check \
-        doc alldoc doc-inner \
+        doc alldoc doc_inner \
         install uninstall \
         version gittag \
         clean src-clean gtags-clean \
-        test-clean doc-clean doc-inner-clean
+        test-clean doc-clean doc_inner-clean
 
-CMD := casl2 comet2 dumpword
+CMD := casl2 comet2 dumpword casl2rev
 
 CAT := cat
 CP := cp
-ECHO := echo
-GITTAG := git tag
+ECHO := /bin/echo
+EXPR := expr
+GIT := git
+GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
+WC := wc
 WHICH := which
+XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
 
-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)
 
-all: build doc gtags
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 
-build: version
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+
+VERSIONFILES = include/package.h \
+        test/system/casl2_opt/opt_v/0.txt \
+        test/system/comet2_opt/opt_v/0.txt \
+        test/system/dumpword/opt_v/0.txt
+
+all: build INSTALL gtags
+
+build:
 	$(MAKE) -C src all
 	$(CP) $(addprefix src/,$(CMD)) ./
 
 gtags:
 	$(if $(strip $(shell $(WHICH) $(GTAGS))),$(GTAGS),@$(ECHO) '$(GTAGS): not found')
 
-doc:
-	$(MAKE) -C doc base
-	$(MAKE) INSTALL
-
 INSTALL: doc/install.txt
 	$(CP) $< $@
 
+doc/install.txt:
+	$(MAKE) -C doc base
+
 alldoc:
 	$(MAKE) -C doc all
 
-doc-inner:
+doc_inner:
 	$(MAKE) -C doc_inner all
 
 check:
 	$(MAKE) -sC test/system
 
-install: casl2 comet2 dumpword install-info install-casl2lib
+install: casl2 comet2 dumpword install-info
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) $(CMD) $(bindir)/
 
-uninstall: uninstall-info uninstall-casl2lib
+install-info:
+	$(MAKE) -C doc install-info
+
+uninstall: uninstall-info
 	$(RM) $(prefix $(bindir)/,$(CMD))
 
 version: $(VERSIONFILES)
@@ -61,12 +76,12 @@ 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
+clean: src-clean doc-clean doc_inner-clean
 
 cmd-clean:
 	$(RM) $(CMD)
@@ -74,13 +89,16 @@ cmd-clean:
 src-clean:
 	$(MAKE) -sC src clean
 
+src-distclean:
+	$(MAKE) -sC src distclean
+
 gtags-clean:
 	$(RM) GPATH GRTAGS GSYMS GTAGS
 
 doc-clean:
 	$(MAKE) -sC doc clean
 
-doc-inner-clean:
+doc_inner-clean:
 	$(MAKE) -sC doc_inner clean
 
 version-clean: