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

diff --git a/Makefile b/Makefile
index bf9dff9..c1b6483 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,47 @@
-.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
-CAT ?= cat
+.PHONY: all build gtags \
+        check \
+        doc info html 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
+
+CAT := cat
+CP := cp
+ECHO := echo
+GITTAG := git tag
+GTAGS := gtags
+INSTALL := install
+SED := sed
+WHICH := which
 
 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
 
-all: build docall gtags
+all: build doc gtags
 
-build:
+build: version
 	$(MAKE) -C src all
+	$(CP) $(addprefix src/,$(CMD)) ./
 
 gtags:
-	@$(WHICH) $(GTAGS) >/dev/null && $(GTAGS) || $(ECHO) "$(GTAGS): not found"
+	$(if $(strip $(shell $(WHICH) $(GTAGS))),$(GTAGS),@$(ECHO) '$(GTAGS): not found')
+
+doc:
+	$(MAKE) -C doc base
+	$(MAKE) INSTALL
 
-docall: doc
+INSTALL: doc/install.txt
+	$(CP) $< $@
+
+alldoc:
 	$(MAKE) -C doc all
 
 info:
@@ -38,45 +58,51 @@ check:
 
 install: casl2 comet2 dumpword install-info install-casl2lib
 	$(INSTALL) -d $(bindir)
-	$(INSTALL) casl2 comet2 dumpword $(bindir)/
+	$(INSTALL) $(CMD) $(bindir)/
 
 uninstall: uninstall-info uninstall-casl2lib
-	$(RMF) $(bindir)/casl2 $(bindir)/comet2 $(bindir)/dumpword
+	$(RM) $(prefix $(bindir)/,$(CMD))
 
 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: VERSION $(VERSIONFILES)
-	@$(ECHO) "YACASL2 Version:" `$(CAT) VERSION`
+version: $(VERSIONFILES)
+	@$(ECHO) "YACASL2 Version: $(VERSION)"
 
 $(VERSIONFILES): VERSION
-	$(SED) -e "s/@@VERSION@@/`cat VERSION`/g" $@.version >$@
+	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
+
+gittag: VERSION
+	$(GITTAG) $(VERSION)
 
-clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version
+clean: cmd-clean src-clean gtags-clean doc-clean doc-inner-clean version-clean
 
-clean-src:
+cmd-clean:
+	@$(RM) $(CMD)
+
+src-clean:
 	@$(MAKE) -sC src clean
 
-clean-gtags:
-	@$(RMF) GPATH GRTAGS GSYMS GTAGS
+gtags-clean:
+	@$(RM) GPATH GRTAGS GSYMS GTAGS
 
-clean-doc:
+doc-clean:
 	@$(MAKE) -sC doc clean
 
-clean-doc-inner:
+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