cmd.cの削除に伴い、ユニットテストとdoxygenドキュメントを修正

diff --git a/src/doxygen.c b/src/doxygen.c
index 7eb00faade27e32ac7bbfd62aa769ee554c24f6d..a1705f625054b14ce302938ba3ebe6eb676f0d32 100644 (file)
--- a/src/doxygen.c
+++ b/src/doxygen.c
@@ -8,7 +8,6 @@
  * \section そのほかのソースファイル
  * - src/assemble.c
  * - src/cerr.c
- * - src/cmd.c
  * - src/cmem.c
  * - src/dump.c
  * - src/exec.c

diff --git a/test/unit/.gitignore b/test/unit/.gitignore
index 4d71d674e445466a17e0c16e2c62ea49a9bc086f..bc4e289c910374f63ef1ced748f31ae787f02a72 100644 (file)
--- a/test/unit/.gitignore
+++ b/test/unit/.gitignore
@@ -1,4 +1,5 @@
 */1.txt
 */err.txt
 */*.log
+*/cmd
 */cmd.dSYM

diff --git a/test/unit/addcerrlist/Makefile b/test/unit/addcerrlist/Makefile
index b2087fb376deaf3ec1f190bbaa70cfce394dceb5..1bf39b9fb0a633725a4c8ba27556cb2542b84ed3 100644 (file)
--- a/test/unit/addcerrlist/Makefile
+++ b/test/unit/addcerrlist/Makefile
@@ -4,8 +4,6 @@ include ../Test.mk
 CC := gcc
 CFLAGS := -Wall
 
-.INTERMEDIATE: $(CMD_FILE)
-
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
@@ -13,3 +11,8 @@ TESTTARGET_FILES := $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c      # Set test targ
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/getcmdcode/Makefile b/test/unit/getcmdcode/Makefile
index 42ae4fbd44bdba66072858562d4aebf75dff0c1e..9d22ef3be5a33abb8fb5d93872c8b955f1eed692 100644 (file)
--- a/test/unit/getcmdcode/Makefile
+++ b/test/unit/getcmdcode/Makefile
@@ -9,7 +9,12 @@ CFLAGS := -Wall
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
-TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmd.c  $(TARGETDIR)/exec.c $(TARGETDIR)/struct.c $(TARGETDIR)/dump.c  $(TARGETDIR)/word.c $(TARGETDIR)/cmem.c  $(TARGETDIR)/cerr.c      # Set test target files
+TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/exec.c $(TARGETDIR)/struct.c $(TARGETDIR)/dump.c  $(TARGETDIR)/word.c $(TARGETDIR)/cmem.c  $(TARGETDIR)/cerr.c      # Set test target files
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/getgr/Makefile b/test/unit/getgr/Makefile
index 09a9d159bb5ee1302a498327cc0ff975aa21391a..1a1f6f562eec5fd2e16c5d8e82e56237f09e8f12 100644 (file)
--- a/test/unit/getgr/Makefile
+++ b/test/unit/getgr/Makefile
@@ -9,7 +9,12 @@ CFLAGS := -Wall
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
-TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/cmd.c $(TARGETDIR)/assemble.c $(TARGETDIR)/word.c $(TARGETDIR)/label.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c      # Set test target files
+TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/assemble.c $(TARGETDIR)/word.c $(TARGETDIR)/label.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c      # Set test target files
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/hash/Makefile b/test/unit/hash/Makefile
index 864a2797577b1fc25f08d106475a6ef0e0d6f733..b867a523ff93885b73d04b32c17c739a6b51e8d7 100644 (file)
--- a/test/unit/hash/Makefile
+++ b/test/unit/hash/Makefile
@@ -13,4 +13,8 @@ TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
-       @rm -rf cmd.dSYM
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/linetok/Makefile b/test/unit/linetok/Makefile
index 167af4f7b9c309fbd31e60d7b5839161fcd9c2be..d83f7d69a7c5a98da0891c3157621e2bdf48d1c9 100644 (file)
--- a/test/unit/linetok/Makefile
+++ b/test/unit/linetok/Makefile
@@ -9,7 +9,7 @@ CFLAGS := -g -Wall
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
-TESTTARGET_FILES := $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/cmd.c $(TARGETDIR)/word.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/hash.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c      # Set test target files
+TESTTARGET_FILES := $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/word.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/hash.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c      # Set test target files
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^

diff --git a/test/unit/nh2word/Makefile b/test/unit/nh2word/Makefile
index e57e812d50e20288cee977a4440e00f2f153e7ac..c3eb357182e0535ce1c55ef8e0a7fd269daf6be4 100644 (file)
--- a/test/unit/nh2word/Makefile
+++ b/test/unit/nh2word/Makefile
@@ -13,3 +13,8 @@ TESTTARGET_FILES := cmd.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/w
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/opdtok/Makefile b/test/unit/opdtok/Makefile
index 445aabcc9c0f01eb202a00668b79672bdc7d5ddf..ed8ae60ba459669138f3c12386f549ac32945d7c 100644 (file)
--- a/test/unit/opdtok/Makefile
+++ b/test/unit/opdtok/Makefile
@@ -9,7 +9,12 @@ CFLAGS := -Wall
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
-TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/cmd.c $(TARGETDIR)/assemble.c $(TARGETDIR)/word.c $(TARGETDIR)/label.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c     # Set test target files
+TESTTARGET_FILES := $(TARGETDIR)/hash.c $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c $(TARGETDIR)/assemble.c $(TARGETDIR)/word.c $(TARGETDIR)/label.c $(TARGETDIR)/struct.c $(TARGETDIR)/token.c $(TARGETDIR)/exec.c $(TARGETDIR)/dump.c     # Set test target files
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd

diff --git a/test/unit/setcerr/Makefile b/test/unit/setcerr/Makefile
index b2087fb376deaf3ec1f190bbaa70cfce394dceb5..1bf39b9fb0a633725a4c8ba27556cb2542b84ed3 100644 (file)
--- a/test/unit/setcerr/Makefile
+++ b/test/unit/setcerr/Makefile
@@ -4,8 +4,6 @@ include ../Test.mk
 CC := gcc
 CFLAGS := -Wall
 
-.INTERMEDIATE: $(CMD_FILE)
-
 CMDSRC_FILE := cmd.c
 TARGETDIR := ../../../src
 INCLUDEDIR := ../../../include
@@ -13,3 +11,8 @@ TESTTARGET_FILES := $(TARGETDIR)/cmem.c $(TARGETDIR)/cerr.c      # Set test targ
 
 $(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
        $(CC) $(CFLAGS) -I $(INCLUDEDIR) -o $@ $^
+
+clean_cmd:
+       @rm -rf cmd.dSYM cmd
+
+clean: clean_cmd