Merge branch

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index 590022e..e88b56f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,56 @@
-.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
 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)
-VER := $(shell $(ECHO) $(VERSION) | $(SED) -e 's/^v\([0-9.]*\)p\([0-9]*\)/\1/')
-PATCH := $(shell $(ECHO) $(VERSION) | $(SED) -e 's/^v[0-9.]*p\([0-9]*\)/\1/')
 
-VERSIONFILES = include/package.h \
-        test/system/casl2/opt_v/0.txt \
-        test/system/comet2/opt_v/0.txt \
+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
 
-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
 
@@ -57,11 +60,23 @@ 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: casl2 comet2 dumpword install-info
        $(INSTALL) -d $(bindir)
        $(INSTALL) $(CMD) $(bindir)/
 
-uninstall: uninstall-info uninstall-casl2lib
+install-info:
+       $(MAKE) -C doc install-info
+
+uninstall: uninstall-info
        $(RM) $(prefix $(bindir)/,$(CMD))
 
 version: $(VERSIONFILES)
@@ -71,9 +86,7 @@ $(VERSIONFILES): VERSION
        @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
 gittag:
-       patch=$(PATCH); while ($(GIT) tag | $(GREP) v$(VER)p$${patch}); do $(EXPR) $${patch} + 1; done; $(ECHO) v$(VER)p$${patch} >VERSION
-       if ($(GIT) status -s | $(GREP) VERSION); then $(GIT) add VERSION; $(GIT) commit --amend --no-edit; fi
-       $(CAT) VERSION | $(XARGS) $(GIT) tag
+       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