subdirmk: Merge new version and fix everything

[secnet.git] / test-common.sd.mk

diff --git a/test-common.sd.mk b/test-common.sd.mk
index 81b3722fdc71852ad21d46869b3fe3b3524ee7e0..023e41c7976dca43cffcaadc33563f565b15b2b1 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -7,7 +7,7 @@ include common.make
 &DEPS += $(src)/test-common.tcl
 &DEPS += common.make
 &DEPS += $(src)/test-common.sd.mk
-&DEPS += &/Subdir.mk
+&DEPS += &/Dir.mk
 
 &check-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
 
@@ -18,14 +18,13 @@ CHECK_SILENT ?= @
        $(CHECK_SILENT) export SECNET_TEST_BUILDDIR=$(topbuilddir); \
         export PYTHONBYTECODEBASE=/dev/null; \
         cd $(src) && \
-        &/t-$* >$(topbuilddir)/&/d-$*/log 2>\&1 \
-        || { cat $(topbuilddir)/&/d-$*/log >\&2; false; }
+        &/t-$* >$(topbuilddir)/&/d-$*/log 2>&\&1 \
+        || { cat $(topbuilddir)/&/d-$*/log >&\&2; false; }
        $(CHECK_SILENT) printf "&/$* "
        $(CHECK_SILENT) touch $@
 
+&CLEAN += & *.so
+
 &clean::
-       $(RM) -f & *.o *.so
        $(RM) -rf & tmp
        $(RM) -rf & d-*
-
-&:include subdirmk/clean.sd.mk