aboutsummaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-10-21 09:41:04 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-10-21 09:41:04 +0200
commitd321f7983e84d45ab86c33989cfc69e1a8d46cd0 (patch)
tree74ccc2aadf4b0aa34f64d5c7ddc30b8e174ecb6c /dist
parent97081a30ee6a4ba5db2ad9d54017a6709b358eec (diff)
Don't run tests from root makefile/nmakefile
Diffstat (limited to 'dist')
-rw-r--r--dist/makefile2
-rw-r--r--dist/nmakefile7
2 files changed, 6 insertions, 3 deletions
diff --git a/dist/makefile b/dist/makefile
index 83b9661..f1b7a7e 100644
--- a/dist/makefile
+++ b/dist/makefile
@@ -1,6 +1,6 @@
dirs := libxsde examples
-ifneq ($(filter $(MAKECMDGOALS),gen test clean cleanobj),)
+ifneq ($(filter $(MAKECMDGOALS),gen clean cleanobj),)
dirs += tests
endif
diff --git a/dist/nmakefile b/dist/nmakefile
index 03dbab7..26d240e 100644
--- a/dist/nmakefile
+++ b/dist/nmakefile
@@ -4,7 +4,10 @@ all:
@for %i in ( $(dirs) ) do \
@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
-gen test clean cleanobj:
- @for %i in ( $(dirs) tests ) do \
+test:
+ @for %i in ( $(dirs) ) do \
@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+gen clean cleanobj:
+ @for %i in ( $(dirs) tests ) do \
+@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"