Fix the build.

(This used to be commit ecaa5bb83b5cf319718d15aff96152d70fa19f7f)

diff --git a/source4/Makefile b/source4/Makefile
index 98c45a34ad8649f281513272a34c5459ade24428..f2567e6ac4a36704dd371af1ef945a6b3c85840a 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -51,6 +51,8 @@ include data.mk
 
 BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
 
+pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
+
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
                   include/includes.d
 

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 780c098b68ac78a6858dc71e40a04f4c474caf08..7d4678b7ac4be15a66da0f58196cace76d4a4a4e 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -91,7 +91,7 @@ PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
 
 [MODULE::auth]
 INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = smbd
+SUBSYSTEM = service
 PRIVATE_PROTO_HEADER = auth_proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
 

diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index 57bf0169fe7cea1dd8ec87493274e1771654bdcb..6c1798212e89d557f019062d580375f093d307bd 100644 (file)
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -56,3 +56,7 @@ clean::
 
 pydoctor:: pythonmods
        LD_LIBRARY_PATH=bin/shared PYTHONPATH=$(pythonbuilddir) pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package $(pythonbuilddir)/samba
+
+bin/python/%.py: 
+       mkdir -p $(@D)
+       cp $< $@

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 9ce04ca8d42abec3f593c1b29b85366b42912427..9518c2eabe4ba0dee1fd4923d138d29f6d74ee65 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -326,9 +326,9 @@ sub PythonFiles($$)
 
        foreach (@{$ctx->{PYTHON_FILES}}) {
                my $target = "bin/python/".basename($_);
-               my $source = "\$(addprefix $ctx->{BASEDIR}/, $target)";
+               my $source = "\$(addprefix $ctx->{BASEDIR}/, $_)";
                $self->output("$target: $source\n\n");
-               $self->output("PYTHON_PYS += $source\n");
+               $self->output("PYTHON_PYS += $target\n");
        }
 }
 

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 2f010644b164bff6836ac311423e34854e87191b..59f628fe184964fbaf1b8b79691ecdfdf37c9550 100644 (file)
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -22,18 +22,8 @@ python_misc_OBJ_FILES = scripting/python/misc_wrap.o
 
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
-pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
-
-bin/python/%.py: 
-       mkdir -p $(@D)
-       cp $< $@
-
 installpython:: pythonmods
        @$(SHELL) $(srcdir)/script/installpython.sh \
                $(INSTALLPERMS) \
                $(DESTDIR)$(PYTHONDIR) \
                scripting/python bin/python
-
-clean::
-       @echo "Removing python modules"
-       @rm -rf bin/python/*

diff --git a/source4/static_deps.mk b/source4/static_deps.mk
index ade41614c24329f74ce16c14798246f8e7e143da..a442b0102527c086d15d5fb5867e2d207c562244 100644 (file)
--- a/source4/static_deps.mk
+++ b/source4/static_deps.mk
@@ -11,7 +11,6 @@ lib/charset/charset.h: lib/charset/charset_proto.h
 include/includes.h: \
                include/config.h \
                lib/charset/charset.h \
-               param/proto.h \
                librpc/gen_ndr/misc.h
 
 heimdal_basics: \