git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
python: Use relative paths for registry.
[kai/samba.git] / source4 / main.mk
diff --git a/source4/main.mk b/source4/main.mk
index 613d76e0b94869a16a1745cb43bddc0804df5a6e..7be6032256b19e4d129722da641f151c6650c13d 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -29,11 +29,10 @@ 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)/include/core.h \
-                 $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
 binaries: $(BINARIES)
@@ -41,9 +40,17 @@ 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
+# 'make everything' fails
+testsuite: bin/smbclient bin/cifsdd bin/smbtorture bin/nmblookup
+
 showlayout: 
        @echo 'Samba will be installed into:'
        @echo '  basedir:     $(BASEDIR)'
@@ -59,8 +66,7 @@ showlayout:
        @echo '  logfilebase: $(LOGFILEBASE)'
        @echo '  setupdir:    $(SETUPDIR)'
        @echo '  jsdir:       $(JSDIR)'
-       @echo '  webappsdir:  $(WEBAPPSDIR)'
-       @echo '  servicesdir: $(SERVICESDIR)'
+       @echo '  swatdir:     $(SWATDIR)'
        @echo '  mandir:      $(MANDIR)'
        @echo '  torturedir:  $(TORTUREDIR)'
        @echo '  datadir:     $(DATADIR)'
@@ -73,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)'
@@ -87,7 +95,7 @@ showflags:
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
-install: showlayout everything installbin installdat installwebapps installmisc installlib \
+install: showlayout everything installbin installdat installswat installmisc installlib \
        installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
@@ -148,9 +156,8 @@ installheader: headers installdirs
 installdat: installdirs
        @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(DATADIR) $(srcdir)
 
-installwebapps: installdirs
-       @$(SHELL) $(srcdir)/script/installwebapps.sh $(DESTDIR)$(WEBAPPSDIR) $(srcdir)
-       @$(SHELL) $(srcdir)/script/installjsonrpc.sh $(DESTDIR)$(SERVICESDIR) $(srcdir)
+installswat: installdirs
+       @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
 
 installman: manpages installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
@@ -209,7 +216,8 @@ $(IDL_HEADER_FILES) \
        $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
        $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
        $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
-       $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES): idl
+       $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
+       $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
 
 idl_full: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm 
        @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL
@@ -269,13 +277,12 @@ distclean: clean
        -rm -f config.status
        -rm -f config.log config.cache
        -rm -f config.pm config.mk
-       -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache
        -rm -f $(PC_FILES)
 
 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
@@ -283,72 +290,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-quick
-
-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-quick
-
-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
Kai's WIP code