X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=Makefile;h=b0745119e78d37e877dcc40c8a92a2712edc359f;hp=60e271e2da0360814b6d8f296a26a1ba59afb013;hb=886b03134f0e5aad0ed3c29ae8d4e7cfa785f808;hpb=ff9e019a212933893379070f7c912f5ab84c57fa

diff --git a/Makefile b/Makefile
index 60e271e..b074511 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,37 @@
 .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
 
-GTAGS := gtags
-RMF := rm -f
-WHICH := which
+CMD := casl2 comet2 dumpword
+
+CAT := cat
+CP := cp
 ECHO := echo
+GITTAG := git tag
+GTAGS := gtags
 INSTALL := install
 SED := sed
-CAT := cat
-XARGS := xargs
-GITTAG := git tag
+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
+
+INSTALL: doc/install.txt
+	$(CP) $< $@
 
 docall:
 	$(MAKE) -C doc all
@@ -40,39 +50,42 @@ 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
-	$(CAT) $@ | $(XARGS) $(GITTAG)
+	$(GITTAG) $(VERSION)
+
+clean: clean-cmd clean-src clean-gtags clean-doc clean-doc-inner clean-version
 
-clean: clean-src clean-gtags clean-doc clean-doc-inner clean-version
+clean-cmd:
+	@$(RM) $(CMD)
 
 clean-src:
 	@$(MAKE) -sC src clean
 
 clean-gtags:
-	@$(RMF) GPATH GRTAGS GSYMS GTAGS
+	@$(RM) GPATH GRTAGS GSYMS GTAGS
 
 clean-doc:
 	@$(MAKE) -sC doc clean
@@ -80,8 +93,8 @@ clean-doc:
 clean-doc-inner:
 	@$(MAKE) -sC doc_inner clean
 
+clean-version:
+	@$(RM) $(VERSIONFILES)
+
 clean-test:
 	@$(MAKE) -sC test clean
-
-clean-version:
-	@$(RMF) $(VERSIONFILES)