X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=6397760cce7cd1b7a9f48ce729302291d2a74210;hb=8f2ea859edcc5da2ecf6cbc3d016f7e8592dfb9d;hp=e9e6678c0264f7925f409977b1708668b56b79d4;hpb=2334b6cb53c0bdea347da4b369602bdd8cf6fbbd;p=YACASL2.git

diff --git a/Makefile b/Makefile
index e9e6678..6397760 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
-.PHONY: all build gtags \
-        check \
+.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
 
-CMD := casl2 comet2 dumpword
-
 CAT := cat
-CP := cp
+CP := cp -v
 ECHO := /bin/echo
 EXPR := expr
 GIT := git
@@ -23,6 +21,7 @@ XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
 
 VERSION := $(shell $(CAT) VERSION)
 
@@ -30,27 +29,28 @@ 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 \
+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
 
-all: build doc gtags
+CMDFILES := casl2 comet2 dumpword casl2rev comet2monitor
+
+all: build INSTALL gtags
 
-build:
+build: version
 	$(MAKE) -C src all
-	$(CP) $(addprefix src/,$(CMD)) ./
+	@(for f in $(CMDFILES); do if test ! -e $$f -o 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
 
@@ -60,12 +60,24 @@ doc_inner:
 check:
 	$(MAKE) -sC test/system
 
-install: casl2 comet2 dumpword install-info install-casl2lib
+smoke:
+	$(MAKE) -sC test/system smoke
+
+smoke-valgrind:
+	$(MAKE) -sC test/system smoke-valgrind
+
+valgrind:
+	$(MAKE) -sC test/system valgrind
+
+install: $(CMDFILES) install-info
 	$(INSTALL) -d $(bindir)
-	$(INSTALL) $(CMD) $(bindir)/
+	$(INSTALL) $(CMDFILES) $(bindir)/
+
+install-info:
+	$(MAKE) -C doc install-info
 
-uninstall: uninstall-info uninstall-casl2lib
-	$(RM) $(prefix $(bindir)/,$(CMD))
+uninstall: uninstall-info
+	$(RM) $(prefix $(bindir)/,$(CMDFILES))
 
 version: $(VERSIONFILES)
 	@$(ECHO) "YACASL2 Version: $(VERSION)"
@@ -81,7 +93,7 @@ distclean: cmd-clean src-distclean gtags-clean version-clean clean
 clean: src-clean doc-clean doc_inner-clean
 
 cmd-clean:
-	$(RM) $(CMD)
+	$(RM) $(CMDFILES)
 
 src-clean:
 	$(MAKE) -sC src clean