From 1b2f29de0666f4a5ecc22ad39b611fe8b250e8fb Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Thu, 25 Jul 2013 08:58:47 +0900
Subject: [PATCH] =?utf8?q?src/Makefile=E3=81=A7=E3=80=81.d=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E3=82=A4=E3=83=B3=E3=82=AF?=
 =?utf8?q?=E3=83=AB=E3=83=BC=E3=83=89=E3=81=99=E3=82=8B=E6=9B=B8=E3=81=8D?=
 =?utf8?q?=E6=96=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 VERSION      |  2 +-
 src/Makefile | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/VERSION b/VERSION
index 75a975b..a6066f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.2p17
+v0.2p20
diff --git a/src/Makefile b/src/Makefile
index 932dac4..f1ae419 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,11 @@
-# ヘッダファイルの場所
+# ソースファイル。グループに分類
+CMDOBJ := casl2 comet2 dumpword
+COMMONOBJ := word cmem cerr
+CASL2OBJ := struct hash
+ASOBJ := assemble token label
+EXECOBJ := exec dump
+
+# ヘッダファイル
 INCLUDEDIR := ../include
 INCLUDE = -I $(INCLUDEDIR)
 
@@ -11,13 +18,6 @@ ECHO := echo
 SED := sed
 WHICH := which
 
-# ソースの分類
-CMDOBJ := casl2 comet2 dumpword
-COMMONOBJ := word cmem cerr
-CASL2OBJ := struct hash
-ASOBJ := assemble token label
-EXECOBJ := exec dump
-
 .PHONY: all build tag clean
 
 all: build tag
@@ -25,15 +25,16 @@ all: build tag
 # casl2、comet2、dumpwordのビルド
 build: $(CMDOBJ)
 
-casl2: casl2.o $(addsuffix .o,$(COMMONOBJ) $(CASL2OBJ) $(ASOBJ) $(EXECOBJ))
+casl2: $(addsuffix .o,casl2 $(COMMONOBJ) $(CASL2OBJ) $(ASOBJ) $(EXECOBJ))
 
-comet2: comet2.o $(addsuffix .o,$(COMMONOBJ) $(CASL2OBJ) $(EXECOBJ))
+comet2: $(addsuffix .o,comet2 $(COMMONOBJ) $(CASL2OBJ) $(EXECOBJ))
 
-dumpword: dumpword.o $(addsuffix .o,$(COMMONOBJ))
+dumpword: $(addsuffix .o,dumpword $(COMMONOBJ))
 
 # .dファイルからヘッダファイルの依存関係を取得する
 # tags、check、clean、.d で終わるターゲットの場合は除く
-ifeq (,$(filter %tags %check %clean %.d,$(MAKECMDGOALS)))
+NODEP := %tags %check %clean %.d
+ifeq ($(filter $(NODEP),$(MAKECMDGOALS)),)
   -include $(addsuffix .d,$(CMDOBJ) $(COMMONOBJ) $(CASL2OBJ) $(ASOBJ) $(EXECOBJ))
 endif
 
@@ -51,7 +52,7 @@ TAGS: $(INCLUDEDIR)/*.h *.c
 distclean: clean
 	$(RM) casl2 comet2 dumpword
 
-clean: tag-clean
+clean:
 	$(RM) *.o *.d
 
 tag-clean:
-- 
2.18.0