r26593: - More work on the python versions of samba3dump and the samba3sam tests.

[samba.git] / source4 / main.mk

diff --git a/source4/main.mk b/source4/main.mk
index 1a6524cbf420c5cf48e2bbdf9d2102be3653a826..38c76bb99c514645914d61c7fc14fc1379680713 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -29,7 +29,7 @@ include librpc/config.mk
 include client/config.mk
 include libcli/config.mk
 include scripting/ejs/config.mk
-include scripting/swig/config.mk
+include scripting/python/config.mk
 include kdc/config.mk
 
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
@@ -40,9 +40,11 @@ libraries: $(STATIC_LIBS) $(SHARED_LIBS)
 modules: $(SHARED_MODULES)
 headers: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
 manpages: $(MANPAGES)
-all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules
+all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods
 everything: all libraries headers
 
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
+
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm
 # scripts use that it as fallback in case
@@ -77,12 +79,14 @@ showflags:
        @echo '  CC         = $(CC)'
        @echo '  CFLAGS     = $(CFLAGS)'
        @echo '  PICFLAG    = $(PICFLAG)'
-       @echo '  LD         = $(LD)'
-       @echo '  LDFLAGS    = $(LDFLAGS)'
+       @echo '  BNLD       = $(BNLD)'
+       @echo '  BNLD_FLAGS = $(BNLD_FLAGS)'
        @echo '  STLD       = $(STLD)'
        @echo '  STLD_FLAGS = $(STLD_FLAGS)'
        @echo '  SHLD       = $(SHLD)'
        @echo '  SHLD_FLAGS = $(SHLD_FLAGS)'
+       @echo '  MDLD       = $(MDLD)'
+       @echo '  MDLD_FLAGS = $(MDLD_FLAGS)'
        @echo '  SHLIBEXT   = $(SHLIBEXT)'
        @echo '  srcdir     = $(srcdir)'
        @echo '  builddir   = $(builddir)'
@@ -277,7 +281,7 @@ distclean: clean
 removebackup:
        -rm -f *.bak *~ */*.bak */*~ */*/*.bak */*/*~ */*/*/*.bak */*/*/*~
 
-realdistclean: distclean removebackup
+realdistclean:: distclean removebackup
        -rm -f include/config_tmp.h.in
        -rm -f version.h
        -rm -f configure
@@ -285,72 +289,7 @@ realdistclean: distclean removebackup
 
 check:: test
 
-SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
-    --builddir=$(builddir) --srcdir=$(srcdir) \
-    --expected-failures=$(srcdir)/samba4-knownfail \
-    --skip=$(srcdir)/samba4-skip \
-    $(TEST_OPTIONS) 
-
-htmltest: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --format=html $(TESTS)
-
-test: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)
-
-testone: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)
-
-test-swrap: everything
-       $(SELFTEST) --socket-wrapper --immediate $(TESTS)
-
-test-noswrap: everything
-       $(SELFTEST) --immediate $(TESTS)
-
-quicktest: all
-       $(SELFTEST) --quick --socket-wrapper --immediate $(TESTS)
-
-htmlquicktest: all
-       $(SELFTEST) --quick --socket-wrapper --format=html --immediate $(TESTS)
-
-quicktestone: all
-       $(SELFTEST) --quick --socket-wrapper --one $(TESTS)
-
-testenv: everything
-       $(SELFTEST) --socket-wrapper --testenv
-
-valgrindtest: valgrindtest-all
-
-valgrindtest-quick: all
-       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" \
-       $(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
-
-valgrindtest-all: everything
-       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" \
-       $(SELFTEST) --immediate --socket-wrapper $(TESTS)
-
-valgrindtest-env: everything
-       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" \
-       $(SELFTEST) --socket-wrapper --testenv
-
-gdbtest: gdbtest-all
-
-gdbtest-quick: all
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
-       $(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
-
-gdbtest-all: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
-       $(SELFTEST) --immediate --socket-wrapper $(TESTS)
-
-gdbtest-env: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
-       $(SELFTEST) --socket-wrapper --testenv
-
-wintest: all
-       $(SELFTEST) win
+include selftest/config.mk
 
 unused_macros:
        $(srcdir)/script/find_unused_macros.pl `find . -name "*.[ch]"` | sort