src/Makefileで、.dファイルをインクルードする書き方を修正

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f9f0ea..1730124 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ CAT := cat
 CP := cp
 ECHO := echo
 GITTAG := git tag
+GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
@@ -21,11 +22,14 @@ 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
+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 doc gtags
 
-build: version
+build:
        $(MAKE) -C src all
        $(CP) $(addprefix src/,$(CMD)) ./
 
@@ -62,9 +66,9 @@ $(VERSIONFILES): VERSION
        @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
 gittag: VERSION
-       $(GITTAG) $(VERSION)
+       $(GITTAG) | $(GREP) $(VERSION) || $(GITTAG) $(VERSION)
 
-distclean: cmd-clean gtags-clean version-clean clean
+distclean: cmd-clean src-distclean gtags-clean version-clean clean
 
 clean: src-clean doc-clean doc_inner-clean
 
@@ -74,6 +78,9 @@ cmd-clean:
 src-clean:
        $(MAKE) -sC src clean
 
+src-distclean:
+       $(MAKE) -sC src distclean
+
 gtags-clean:
        $(RM) GPATH GRTAGS GSYMS GTAGS