doc/inner/Makefileのgnu_globalとdoxygenを、タイムスタンプ方式に

関連して.gitignoreに*___*を追加

diff --git a/.gitignore b/.gitignore
index 0b666777d9dec9c527cdd6e70a11bf84b61238e2..f719b3a6b28d943c25dcd32f7d5677d20896fcde 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ core
 *.bak
 fontconfig
 *.log.core*
+*___*

diff --git a/VERSION b/VERSION
index 4f27249ea3ba9324472672fd3fb3fcf7eee5672f..02f1fcca2de3e96e333367da863c5f4bcf4e4036 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p53
+v0.5p54

diff --git a/doc_inner/Makefile b/doc_inner/Makefile
index 5e38a58625bb47706187a01187398d4d063f4346..22dc1be22f51dffe6447d996e24bfb411aef6d73 100644 (file)
--- a/doc_inner/Makefile
+++ b/doc_inner/Makefile
@@ -1,23 +1,19 @@
-.PHONY: all clean doxyfile-update doxygen-clean gnu_global-clean cmetrics-clean
+.PHONY: all clean distclean doxygen-clean gnu_global-clean
 
 CD := cd
-CMETRICS := cmetrics
 CP := cp
 DOXYGEN := doxygen
 ECHO := echo
 HTAGS := htags
-INSTALL := install
+LS := ls
+MKDIR := mkdir
 MV := mv
-RMR := rm -rf
 SED := sed
 WHICH := which
 
-DOXYGEN_DIR := doxygen
-DOXYSRCDIR := ..
-GNU_GLOBAL_DIR := gnu_global
-GNU_GLOBAL_SRCDIR := ..
-CMETRICS_DIR := cmetrics
-CMETRICS_SRCDIR := ../src
+SRCDIR := ..
+DOXYGENSTAMP := doxygen___stamp
+GNUGLOBALSTAMP := gnu_global___stamp
 
 # chk_file_ext: 指定されたコマンドが実在する場合にターゲットを指定。
 # 用例: $(call chk_cmd_ext,cmd,target)
@@ -25,42 +21,44 @@ define chk_cmd_ext
     $(if $(strip $(shell $(WHICH) $1)),$2)
 endef
 
-all: $(call chk_cmd_ext,$(DOXYGEN),$(DOXYGEN_DIR)) $(call chk_cmd_ext,$(HTAGS),$(GNU_GLOBAL_DIR)) $(call chk_cmd_ext $(CMETRICS),$(CMETRICS_DIR))
+all: $(call chk_cmd_ext,$(DOXYGEN),doxygen___stamp) $(call chk_cmd_ext,$(HTAGS),gnu_global___stamp)
 
 # doxygenのHTMLドキュメント作成先は、
 # ../Doxyfileで設定された以下のディレクトリーの下のhtmlディレクトリー
 #   OUTPUT_DIRECTORY = doc_inner
-$(DOXYGEN_DIR): $(DOXYSRCDIR)/Doxyfile ../src ../include
-       $(INSTALL) -d $(DOXYGEN_DIR)
-       $(CD) $(DOXYSRCDIR) && $(DOXYGEN)
+doxygen___stamp: $(SRCDIR)/src $(SRCDIR)/include $(SRCDIR)/Doxyfile | doxygen
+       $(CD) $(SRCDIR) && $(DOXYGEN)
+       $(LS) -laR doxygen >$@
 
-doxyfile-update: Doxyfile
-       $(DOXYGEN) -u $<
+doxygen:
+       $(MKDIR) $@
 
-$(DOXYSRCDIR)/Doxyfile: doxyfile-update
-       @$(CP) -vf Doxyfile $(DOXYSRCDIR)/
+Doxyfile:
+       $(DOXYGEN) -u $@
+
+$(SRCDIR)/Doxyfile: | Doxyfile
+       @$(CP) -vf Doxyfile $(SRCDIR)/
 
 # htagsのHTMLドキュメント作成先は、
 # 引数DIRで指定されたディレクトリーの下のHTMLディレクトリー
-$(GNU_GLOBAL_DIR): ../src ../include
-       $(MAKE) -C $(GNU_GLOBAL_SRCDIR) gtags
-       $(CD) $(GNU_GLOBAL_SRCDIR) && $(HTAGS) -anos $(CURDIR) && $(RMR) $(CURDIR)/$@ && $(MV) $(CURDIR)/HTML $(CURDIR)/$@
+gnu_global___stamp: $(SRCDIR)/src $(SRCDIR)/include | gnu_global
+       $(MAKE) -C $(SRCDIR) gtags
+       $(CD) $(SRCDIR) && $(HTAGS) -anos $(CURDIR)
+       $(RM) -r gnu_global
+       $(MV) HTML gnu_global
+       $(LS) -laR gnu_global >$@
 
-$(CMETRICS_DIR):
-       $(INSTALL) -d $(CMETRICS_DIR)
-       $(CMETRICS) $(CMETRICS_SRCDIR) | $(SED) -e '1s/ \{2,\}/ /g' -e '2,$$s/  \{1,\}/ /g' >$(CMETRICS_DIR)/files.tsv
-       $(CMETRICS) -f $(CMETRICS_SRCDIR) | $(SED) -e '1s/ \{2,\}/      /g' -e '2,$$s/  \{1,\}/ /g' >$(CMETRICS_DIR)/functions.tsv
+gnu_global:
+       $(MKDIR) $@
 
-clean: doxygen-clean gnu_global-clean cmetrics-clean
+clean:
+       $(RM) *___stamp
 
-distclean: clean
+distclean: clean doxygen-clean gnu_global-clean
 
 doxygen-clean:
-       $(RMR) $(DOXYGEN_DIR)
+       $(RM) -r doxygen
        $(RM) ../Doxyfile
 
 gnu_global-clean:
-       $(RMR) $(GNU_GLOBAL_DIR)
-
-cmetrics-clean:
-       $(RMR) $(CMETRICS_DIR)
+       $(RM) -r gnu_global