projects
/
YACASL2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ac006f1
)
makeにdoc_inner-cleanターゲットを追加
author
j8takagi
<j8takagi@nifty.com>
Sun, 21 Apr 2013 08:50:54 +0000
(17:50 +0900)
committer
j8takagi
<j8takagi@nifty.com>
Sun, 21 Apr 2013 08:50:54 +0000
(17:50 +0900)
Makefile
patch
|
blob
|
history
doc_inner/Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
ad22d42
..
7f9f0ea
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,10
@@
.PHONY: all build gtags \
check \
.PHONY: all build gtags \
check \
- doc alldoc doc
-
inner \
+ doc alldoc doc
_
inner \
install uninstall \
version gittag \
clean src-clean gtags-clean \
install uninstall \
version gittag \
clean src-clean gtags-clean \
- test-clean doc-clean doc
-
inner-clean
+ test-clean doc-clean doc
_
inner-clean
CMD := casl2 comet2 dumpword
CMD := casl2 comet2 dumpword
@@
-42,7
+42,7
@@
INSTALL: doc/install.txt
alldoc:
$(MAKE) -C doc all
alldoc:
$(MAKE) -C doc all
-doc
-
inner:
+doc
_
inner:
$(MAKE) -C doc_inner all
check:
$(MAKE) -C doc_inner all
check:
@@
-66,7
+66,7
@@
gittag: VERSION
distclean: cmd-clean gtags-clean version-clean clean
distclean: cmd-clean gtags-clean version-clean clean
-clean: src-clean doc-clean doc
-
inner-clean
+clean: src-clean doc-clean doc
_
inner-clean
cmd-clean:
$(RM) $(CMD)
cmd-clean:
$(RM) $(CMD)
@@
-80,7
+80,7
@@
gtags-clean:
doc-clean:
$(MAKE) -sC doc clean
doc-clean:
$(MAKE) -sC doc clean
-doc
-
inner-clean:
+doc
_
inner-clean:
$(MAKE) -sC doc_inner clean
version-clean:
$(MAKE) -sC doc_inner clean
version-clean:
diff --git
a/doc_inner/Makefile
b/doc_inner/Makefile
index
e8b8903
..
68af59b
100644
(file)
--- a/
doc_inner/Makefile
+++ b/
doc_inner/Makefile
@@
-20,22
+20,29
@@
GNU_GLOBAL_SRCDIR := ..
CMETRICS_DIR := cmetrics
CMETRICS_SRCDIR := ../src
CMETRICS_DIR := cmetrics
CMETRICS_SRCDIR := ../src
-all: $(DOXYGEN_DIR) $(GNU_GLOBAL_DIR) $(CMETRICS_DIR)
+# chk_file_ext: 指定されたファイルが実在する場合、エラー
+# 用例: $(call chk_cmd_ext,cmd,target)
+define chk_cmd_ext
+ $(if $(strip $(shell $(WHICH) $1)),$2,,@$(ECHO) '$1: not found')
+endef
+
+all: $(call chk_cmd_ext,$(DOXYGEN),$(DOXYGEN_DIR)) $(call chk_cmd_ext,$(HTAGS),$(GNU_GLOBAL_DIR)) $(call chk_cmd_ext $(CMETRICS),$(CMETRICS_DIR))
# doxygenのHTMLドキュメント作成先は、
# ../Doxyfileで設定された以下のディレクトリーの下のhtmlディレクトリー
# OUTPUT_DIRECTORY = doc_inner
# doxygenのHTMLドキュメント作成先は、
# ../Doxyfileで設定された以下のディレクトリーの下のhtmlディレクトリー
# OUTPUT_DIRECTORY = doc_inner
-$(DOXYGEN_DIR): $(DOXYSRCDIR)/Doxyfile
- $(if $(strip $(shell $(WHICH) $(DOXYGEN))),$(CD) $(DOXYSRCDIR) && $(DOXYGEN) && $(MV) $(CURDIR)/html $(CURDIR)/$@,$(ECHO) '$(DOXYGEN): not found')
+$(DOXYGEN_DIR): $(DOXYSRCDIR)/Doxyfile ../src ../include
+ $(INSTALL) -d $(DOXYGEN_DIR)
+ $(CD) $(DOXYSRCDIR) && $(DOXYGEN)
$(DOXYSRCDIR)/Doxyfile:
$(CP) -f Doxyfile $(DOXYSRCDIR)/
# htagsのHTMLドキュメント作成先は、
# 引数DIRで指定されたディレクトリーの下のHTMLディレクトリー
$(DOXYSRCDIR)/Doxyfile:
$(CP) -f Doxyfile $(DOXYSRCDIR)/
# htagsのHTMLドキュメント作成先は、
# 引数DIRで指定されたディレクトリーの下のHTMLディレクトリー
-$(GNU_GLOBAL_DIR):
+$(GNU_GLOBAL_DIR):
../src ../include
$(MAKE) -C $(GNU_GLOBAL_SRCDIR) gtags
$(MAKE) -C $(GNU_GLOBAL_SRCDIR) gtags
- $(
if $(strip $(shell $(WHICH) $(HTAGS))),$(CD) $(GNU_GLOBAL_SRCDIR) && $(HTAGS) -anosx $(CURDIR) && $(MV) $(CURDIR)/HTML $(CURDIR)/$@,@$(ECHO) '$(HTAGS): not found')
+ $(
CD) $(GNU_GLOBAL_SRCDIR) && $(HTAGS) -anosx $(CURDIR) && $(RMR) $(CURDIR)/$@ && $(MV) $(CURDIR)/HTML $(CURDIR)/$@
$(CMETRICS_DIR):
$(INSTALL) -d $(CMETRICS_DIR)
$(CMETRICS_DIR):
$(INSTALL) -d $(CMETRICS_DIR)