From 87f036b3d45181aa7a0905c2c003416786c84ea8 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Thu, 25 Oct 2012 23:48:15 +0900 Subject: [PATCH] =?utf8?q?Makefile=E3=81=A7=E3=80=81=E5=BF=85=E8=A6=81?= =?utf8?q?=E3=81=AA=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=8C=E3=81=AA?= =?utf8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AE=E5=8B=95=E4=BD=9C=E3=82=92?= =?utf8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 3 ++- doc_inner/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4969245..3d29329 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ GTAGS ?= gtags RMF ?= rm -f WHICH ?= which +ECHO ?= echo all: build doc doc_inner @@ -10,7 +11,7 @@ build: $(MAKE) -C src gtags: - ($(WHICH) $(GTAGS) && $(GTAGS)) >/dev/null + $(WHICH) $(GTAGS) && $(GTAGS) >/dev/null || $(ECHO) "$(GTAGS): not found" check: $(MAKE) -C test/system diff --git a/doc_inner/Makefile b/doc_inner/Makefile index 5c59ef2..ac2414a 100644 --- a/doc_inner/Makefile +++ b/doc_inner/Makefile @@ -7,6 +7,7 @@ HTAGS ?= htags RMRF ?= rm -rf PWD ?= pwd WHICH ?= which +ECHO ?= echo DOXYGEN_DIR := doxygen GNU_GLOBAL_DIR := gnu_global @@ -17,13 +18,13 @@ all: $(DOXYGEN_DIR) $(GNU_GLOBAL_DIR) # ../Doxyfileで設定された以下のディレクトリーの下のhtmlディレクトリー # OUTPUT_DIRECTORY = doc_inner $(DOXYGEN_DIR): ../Doxyfile - ($(WHICH) $(DOXYGEN) && $(CD) .. && $(DOXYGEN) && $(CD) - && $(MV) html $@) >/dev/null + $(WHICH) $(DOXYGEN) && ($(CD) .. && $(DOXYGEN) && $(CD) - && $(MV) html $@) >/dev/null || $(ECHO) "$(DOXYGEN): not found" # htagsのHTMLドキュメント作成先は、 # 引数DIRで指定されたディレクトリーの下のHTMLディレクトリー $(GNU_GLOBAL_DIR): $(MAKE) -C .. gtags - ($(WHICH) $(HTAGS) && $(CD) .. && $(HTAGS) -anosx doc_inner && $(CD) - && $(MV) HTML $@) >/dev/null + $(WHICH) $(HTAGS) && ($(CD) .. && $(HTAGS) -anosx doc_inner && $(CD) - && $(MV) HTML $@) >/dev/null || $(ECHO) "$(HTAGS): not found" clean: clean_doxygen clean_gnu_global -- 2.18.0