ドキュメントの修正

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index 590022e..7222401 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,33 +6,37 @@
         clean src-clean gtags-clean \
         test-clean doc-clean doc_inner-clean
 
         clean src-clean gtags-clean \
         test-clean doc-clean doc_inner-clean
 

-CMD := casl2 comet2 dumpword
+CMD := casl2 comet2 dumpword casl2rev

 
 CAT := cat
 CP := cp
 ECHO := /bin/echo
 
 CAT := cat
 CP := cp
 ECHO := /bin/echo

+EXPR := expr

 GIT := git
 GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
 GIT := git
 GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed

+WC := wc

 WHICH := which
 WHICH := which

-EXPR := expr

 XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
 XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin

+libdir ?= $(prefix)/share

 
 VERSION := $(shell $(CAT) VERSION)
 
 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/')
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)

 
 VERSIONFILES = include/package.h \
 
 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
 
         test/system/dumpword/opt_v/0.txt
 

-all: build doc gtags
+all: build INSTALL gtags

 
 build:
        $(MAKE) -C src all
 
 build:
        $(MAKE) -C src all


@@ -41,13 +45,12 @@ build:
 gtags:
        $(if $(strip $(shell $(WHICH) $(GTAGS))),$(GTAGS),@$(ECHO) '$(GTAGS): not found')
 
 gtags:
        $(if $(strip $(shell $(WHICH) $(GTAGS))),$(GTAGS),@$(ECHO) '$(GTAGS): not found')
 

-doc:
-       $(MAKE) -C doc base
-       $(MAKE) INSTALL
-

 INSTALL: doc/install.txt
        $(CP) $< $@
 
 INSTALL: doc/install.txt
        $(CP) $< $@
 

+doc/install.txt:
+       $(MAKE) -C doc base
+

 alldoc:
        $(MAKE) -C doc all
 
 alldoc:
        $(MAKE) -C doc all
 


@@ -57,11 +60,14 @@ doc_inner:
 check:
        $(MAKE) -sC test/system
 
 check:
        $(MAKE) -sC test/system
 

-install: casl2 comet2 dumpword install-info install-casl2lib
+install: casl2 comet2 dumpword install-info

        $(INSTALL) -d $(bindir)
        $(INSTALL) $(CMD) $(bindir)/
 
        $(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)
        $(RM) $(prefix $(bindir)/,$(CMD))
 
 version: $(VERSIONFILES)


@@ -71,9 +77,7 @@ $(VERSIONFILES): VERSION
        @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
 gittag:
        @$(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
 
 
 distclean: cmd-clean src-distclean gtags-clean version-clean clean