[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e349e2c... Fix "make install" by removing all references to python. Not currently needed in source3, and isn't working anyway. Jeremy.
      from  0d33b0b... Remove pythonmods from the build in source3, it doesn't build anyway and isn't needed (as far as I can tell). Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e349e2c54117c528b9d194f356399c57e2a04b56
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 13:42:28 2009 -0700

    Fix "make install" by removing all references to python. Not currently
    needed in source3, and isn't working anyway.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/samba4.mk |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 7e8687d..1ad46f2 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -124,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
 
@@ -165,10 +165,17 @@ 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 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


-- 
Samba Shared Repository