s3 build: Eliminate the gmake-specific Makefile syntax

[metze/samba/wip.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a1873eb6d5cb8cbddeae9e7e2c8a79a94ed80334..1f28e49b9fc31dd6ddde86f8d771426b6b5c9666 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2930,21 +2930,11 @@ test_pam_modules:: pam_modules
 ## Targets for 'make test'
 ##
 
-ifdef smbtorture4_path
-smbtorture4_path_arg=-t ${smbtorture4_path}
-endif
-
-ifdef selftest_shrdir
-selftest_shrdir_arg=-s ${selftest_shrdir}
-endif
-
-ifdef selftest_custom_conf
-selftest_custom_conf_arg=-c ${selftest_custom_conf}
-endif
+TEST_EXTRA_ARGS = ${smbtorture4_path} ${selftest_shrdir} ${selftest_custom_conf}
 
 test:: all torture timelimit
        @echo Running Test suite
-       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg}
+       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
 valgrindtest:: all torture timelimit
        @echo Running Test suite with valgrind
@@ -2953,7 +2943,7 @@ valgrindtest:: all torture timelimit
         WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
         SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-        PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg}
+        PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
 SELFTEST_FORMAT = plain
 selftestdir = ../selftest