spoolss: add spoolss_security_descriptor.

[abartlet/samba.git/.git] / source3 / samba4.mk

diff --git a/source3/samba4.mk b/source3/samba4.mk
index e63a8453c0e7fbab0be0dfb4a1e171a0adc36519..1ad46f22648da3c13409df539f42c5101f955f96 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -88,6 +88,7 @@ libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline
 poptsrcdir := $(samba4srcdir)/../lib/popt
 socketwrappersrcdir := $(samba4srcdir)/../lib/socket_wrapper
 nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper
+uidwrappersrcdir := $(samba4srcdir)/../lib/uid_wrapper
 libstreamsrcdir := $(samba4srcdir)/lib/stream
 libutilsrcdir := $(samba4srcdir)/../lib/util
 libtdrsrcdir := ../lib/tdr
@@ -123,7 +124,7 @@ tallocsrcdir := $(samba4srcdir)/../lib/talloc
 comsrcdir := $(samba4srcdir)/lib/com
 override ASN1C = bin/asn1_compile4
 override ET_COMPILER = bin/compile_et4
-include $(samba4srcdir)/build/make/python.mk
+#include $(samba4srcdir)/build/make/python.mk
 include samba4-data.mk
 include $(samba4srcdir)/static_deps.mk
 
@@ -164,15 +165,22 @@ clean::
 proto:: $(PROTO_HEADERS)
 modules:: $(PLUGINS)
 
-pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
+#pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
 
-all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup plugins
+all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 setup plugins
 torture:: bin/smbtorture4
+
+#
+## This is a fake rule to stop any python being invoked as currently the
+## build system is broken in source3 with python. JRA.
+#
+installpython:: bin/smbtorture4
+
 everything:: $(patsubst %,%4,$(BINARIES))
 setup:
        @ln -sf ../source4/setup setup
 
-S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared:$$$(LIB_PATH_VAR)"
 
 SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" PYTHON="$(PYTHON)" PERL="$(PERL)" \
     $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \