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

diff --git a/src/doxygen.c b/src/doxygen.c
index 7eb00fa..a1705f6 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 4d71d67..bc4e289 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 b2087fb..1bf39b9 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 42ae4fb..9d22ef3 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 09a9d15..1a1f6f5 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 864a279..b867a52 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 167af4f..d83f7d6 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 e57e812..c3eb357 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 445aabc..ed8ae60 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 b2087fb..1bf39b9 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