summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/Makefile2
-rw-r--r--source4/auth/config.mk2
-rw-r--r--source4/build/make/python.mk4
-rw-r--r--source4/build/smb_build/makefile.pm4
-rw-r--r--source4/scripting/python/config.mk10
-rw-r--r--source4/static_deps.mk1
6 files changed, 9 insertions, 14 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 98c45a34ad..f2567e6ac4 100644
--- 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 780c098b68..7d4678b7ac 100644
--- 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 57bf0169fe..6c1798212e 100644
--- 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 9ce04ca8d4..9518c2eabe 100644
--- 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 2f010644b1..59f628fe18 100644
--- 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 ade41614c2..a442b01025 100644
--- 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: \