casl2libとtestを整理

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index 8bd9f1a..80f8a82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,19 @@ CMD := casl2 comet2 dumpword
 CAT := cat
 CP := cp
 ECHO := /bin/echo
+EXPR := expr
 GIT := git
 GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
+WC := wc
 WHICH := which
-EXPR := expr
 XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
 
 VERSION := $(shell $(CAT) VERSION)
 
@@ -30,8 +32,8 @@ VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
 
 VERSIONFILES = include/package.h \
-        test/system/casl2/opt_v/0.txt \
-        test/system/comet2/opt_v/0.txt \
+        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 doc gtags
@@ -63,6 +65,12 @@ install: casl2 comet2 dumpword install-info install-casl2lib
        $(INSTALL) -d $(bindir)
        $(INSTALL) $(CMD) $(bindir)/
 
+install-info:
+       $(MAKE) -C doc install-info
+
+install-casl2lib:
+       $(MAKE) -C as/casl2lib install-casl2lib
+
 uninstall: uninstall-info uninstall-casl2lib
        $(RM) $(prefix $(bindir)/,$(CMD))
 
@@ -73,7 +81,7 @@ $(VERSIONFILES): 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
+       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