X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=Makefile;h=29e29f1f81a517d2f217e6a2414067925bd441dc;hp=d4014fcb62971f5df8ef4f2dcf4d6f3a513f593e;hb=0b4c42d3274bfcd08db55f5be02626c9e86a81ca;hpb=727c76d45fcb333ef5906826079e56e7f6d04fd3

diff --git a/Makefile b/Makefile
index d4014fc..29e29f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,88 +1,111 @@
-.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
+.PHONY: all srcall gtags \
+        check valgrind \
+        doc alldoc doc_inner \
+        install uninstall \
+        version gittag \
+        clean src-clean gtags-clean \
+        test-clean doc-clean doc_inner-clean
 
+CAT := cat
+CP := cp -v
+ECHO := /bin/echo
+EXPR := expr
+GIT := git
+GREP := grep
 GTAGS := gtags
-RMF := rm -f
-WHICH := which
-ECHO := echo
 INSTALL := install
 SED := sed
-CAT := cat
+WC := wc
+WHICH := which
 XARGS := xargs
-GITTAG := git tag
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
+
+VERSION := $(shell $(CAT) VERSION)
 
-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
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 
-all: build docall gtags
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+
+VERSIONFILES := include/version.h \
+        test/system/casl2_opt/opt_v/0.txt \
+        test/system/comet2_opt/opt_v/0.txt \
+        test/system/dumpword/opt_v/0.txt
+
+CMDFILES := casl2 comet2 dumpword casl2rev
+
+all: build INSTALL gtags
 
 build:
 	$(MAKE) -C src all
+	@(for f in $(CMDFILES); do if test src/$$f -nt $$f; then $(CP) src/$$f $$f; fi; done)
 
 gtags:
-	@$(WHICH) $(GTAGS) >/dev/null && $(GTAGS) || $(ECHO) "$(GTAGS): not found"
+	$(if $(strip $(shell $(WHICH) $(GTAGS))),$(GTAGS),@$(ECHO) '$(GTAGS): not found')
 
-docall:
-	$(MAKE) -C doc all
+INSTALL: doc/install.txt
+	$(CP) $< $@
 
-info:
-	$(MAKE) -C doc info
+doc/install.txt:
+	$(MAKE) -C doc base
 
-html:
-	$(MAKE) -C doc html
+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) -d $(bindir)
-	$(INSTALL) casl2 comet2 dumpword $(bindir)/
+valgrind:
+	$(MAKE) -sC test/system valgrind
 
-uninstall: uninstall-info uninstall-casl2lib
-	$(RMF) $(bindir)/casl2 $(bindir)/comet2 $(bindir)/dumpword
+install: casl2 comet2 dumpword install-info
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) $(CMD) $(bindir)/
 
 install-info:
 	$(MAKE) -C doc install-info
 
-uninstall-info:
-	$(MAKE) -C doc uninstall-info
-
-install-casl2lib:
-	$(MAKE) -C as/casl2lib install-casl2lib
-
-uninstall-casl2lib:
-	$(MAKE) -C as/casl2lib uninstall-casl2lib
+uninstall: uninstall-info
+	$(RM) $(prefix $(bindir)/,$(CMD))
 
 version: $(VERSIONFILES)
 	@$(ECHO) "YACASL2 Version: $(VERSION)"
 
 $(VERSIONFILES): VERSION
-	$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
+	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.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 src-distclean gtags-clean version-clean clean
+
+clean: src-clean doc-clean doc_inner-clean
 
-gittag: VERSION
-	$(GITTAG) $(VERSION)
+cmd-clean:
+	$(RM) $(CMD)
 
-clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version
+src-clean:
+	$(MAKE) -sC src clean
 
-clean-src:
-	@$(MAKE) -sC src clean
+src-distclean:
+	$(MAKE) -sC src distclean
 
-clean-gtags:
-	@$(RMF) GPATH GRTAGS GSYMS GTAGS
+gtags-clean:
+	$(RM) GPATH GRTAGS GSYMS GTAGS
 
-clean-doc:
-	@$(MAKE) -sC doc clean
+doc-clean:
+	$(MAKE) -sC doc clean
 
-clean-doc-inner:
-	@$(MAKE) -sC doc_inner clean
+doc_inner-clean:
+	$(MAKE) -sC doc_inner clean
 
-clean-test:
-	@$(MAKE) -sC test clean
+version-clean:
+	$(RM) $(VERSIONFILES)
 
-clean-version:
-	@$(RMF) $(VERSIONFILES)
+test-clean:
+	$(MAKE) -sC test clean