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

diff --git a/Makefile b/Makefile
index c1b6483..29e29f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,79 +1,77 @@
-.PHONY: all build gtags \
-        check \
-        doc info html doc-inner \
+.PHONY: all srcall gtags \
+        check valgrind \
+        doc alldoc doc_inner \
         install uninstall \
-        install-info uninstall-info \
-        install-casl2lib uninstall-casl2lib \
         version gittag \
         clean src-clean gtags-clean \
-        test-clean doc-clean doc-inner-clean
-
-CMD := casl2 comet2 dumpword
+        test-clean doc-clean doc_inner-clean
 
 CAT := cat
-CP := cp
-ECHO := echo
-GITTAG := git tag
+CP := cp -v
+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)
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+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
 
-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
+CMDFILES := casl2 comet2 dumpword casl2rev
 
-all: build doc gtags
+all: build INSTALL gtags
 
-build: version
+build:
 	$(MAKE) -C src all
-	$(CP) $(addprefix src/,$(CMD)) ./
+	@(for f in $(CMDFILES); do if test src/$$f -nt $$f; then $(CP) src/$$f $$f; fi; done)
 
 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
 
-info:
-	$(MAKE) -C doc info
-
-html:
-	$(MAKE) -C doc html
-
-doc-inner:
+doc_inner:
 	$(MAKE) -C doc_inner all
 
 check:
 	$(MAKE) -sC test/system
 
-install: casl2 comet2 dumpword install-info install-casl2lib
+valgrind:
+	$(MAKE) -sC test/system valgrind
+
+install: casl2 comet2 dumpword install-info
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) $(CMD) $(bindir)/
 
-uninstall: uninstall-info uninstall-casl2lib
-	$(RM) $(prefix $(bindir)/,$(CMD))
-
 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)"
@@ -81,28 +79,33 @@ 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
 
-clean: cmd-clean src-clean gtags-clean doc-clean doc-inner-clean version-clean
+distclean: cmd-clean src-distclean gtags-clean version-clean clean
+
+clean: src-clean doc-clean doc_inner-clean
 
 cmd-clean:
-	@$(RM) $(CMD)
+	$(RM) $(CMD)
 
 src-clean:
-	@$(MAKE) -sC src clean
+	$(MAKE) -sC src clean
+
+src-distclean:
+	$(MAKE) -sC src distclean
 
 gtags-clean:
-	@$(RM) GPATH GRTAGS GSYMS GTAGS
+	$(RM) GPATH GRTAGS GSYMS GTAGS
 
 doc-clean:
-	@$(MAKE) -sC doc clean
+	$(MAKE) -sC doc clean
 
-doc-inner-clean:
-	@$(MAKE) -sC doc_inner clean
+doc_inner-clean:
+	$(MAKE) -sC doc_inner clean
 
 version-clean:
-	@$(RM) $(VERSIONFILES)
+	$(RM) $(VERSIONFILES)
 
 test-clean:
-	@$(MAKE) -sC test clean
+	$(MAKE) -sC test clean