Add gen and cleanobj targets for tests

10 files changed, 23 insertions, 12 deletions

diff --git a/build/dist b/build/dist
index 7476952..3a98f51 100755
--- a/build/dist
+++ b/build/dist
@@ -259,6 +259,10 @@ gen '\t$(root)/bin/xsde' $cmd '$(XSDFLAGS) $(EXTRA_XSDFLAGS)' $opt '$<'
 gen
 fi
 
+gen '.PHONY: gen'
+gen "gen: $gen"
+gen
+
 gen '.PHONY: test'
 gen "test: $driver"
 if [ "$xml" = "" ]; then
@@ -288,7 +292,14 @@ fi
 
 gen
 
-gen '.PHONY: clean'
-gen 'clean:'
-gen "\trm -f $driver $obj $gen_cxx $gen_ixx $gen_hxx"
+gen '.PHONY: clean cleanobj'
+gen 'cleanobj:'
+gen "\trm -f $driver $obj"
+gen
+gen 'clean: cleanobj'
+
+if [ "$gen" != "" ]; then
+  gen "\trm -f $gen_cxx $gen_ixx $gen_hxx"
+fi
+
 gen
diff --git a/dist/tests/cxx/hybrid/nmakefile b/dist/tests/cxx/hybrid/nmakefile
index 76ffe27..fefae35 100644
--- a/dist/tests/cxx/hybrid/nmakefile
+++ b/dist/tests/cxx/hybrid/nmakefile
@@ -36,6 +36,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/nmakefile b/dist/tests/cxx/nmakefile
index 355fd06..99a52a9 100644
--- a/dist/tests/cxx/nmakefile
+++ b/dist/tests/cxx/nmakefile
@@ -12,6 +12,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/nmakefile b/dist/tests/cxx/parser/nmakefile
index c78237d..b4e6d49 100644
--- a/dist/tests/cxx/parser/nmakefile
+++ b/dist/tests/cxx/parser/nmakefile
@@ -47,6 +47,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/validation/built-in/nmakefile b/dist/tests/cxx/parser/validation/built-in/nmakefile
index eea94f5..21e0040 100644
--- a/dist/tests/cxx/parser/validation/built-in/nmakefile
+++ b/dist/tests/cxx/parser/validation/built-in/nmakefile
@@ -22,6 +22,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/validation/nmakefile b/dist/tests/cxx/parser/validation/nmakefile
index d754c86..b417152 100644
--- a/dist/tests/cxx/parser/validation/nmakefile
+++ b/dist/tests/cxx/parser/validation/nmakefile
@@ -14,6 +14,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/nmakefile b/dist/tests/cxx/serializer/nmakefile
index eaadc84..60f98e2 100644
--- a/dist/tests/cxx/serializer/nmakefile
+++ b/dist/tests/cxx/serializer/nmakefile
@@ -48,6 +48,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/validation/built-in/nmakefile b/dist/tests/cxx/serializer/validation/built-in/nmakefile
index dc2b3c9..dc56ec7 100644
--- a/dist/tests/cxx/serializer/validation/built-in/nmakefile
+++ b/dist/tests/cxx/serializer/validation/built-in/nmakefile
@@ -8,6 +8,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/validation/nmakefile b/dist/tests/cxx/serializer/validation/nmakefile
index 4cd2812..278f188 100644
--- a/dist/tests/cxx/serializer/validation/nmakefile
+++ b/dist/tests/cxx/serializer/validation/nmakefile
@@ -12,6 +12,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/nmakefile b/dist/tests/nmakefile
index 1f3db7e..2dea67e 100644
--- a/dist/tests/nmakefile
+++ b/dist/tests/nmakefile
@@ -4,6 +4,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"