Fix pydoctor.

(This used to be commit 023025e4de119aa234f885aa6e5594660bd8f358)

diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index bd0926717d823f602114fa6132fc1132a1df5c37..57bf0169fe7cea1dd8ec87493274e1771654bdcb 100644 (file)
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -53,3 +53,6 @@ pythonmods::
 clean::
        @echo "Removing python modules"
        @rm -rf $(pythonbuilddir)
+
+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

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cafbea6b6ed0946e7990f2f4bff992dbdc3768f3..56634736bd3bf7b6bdbff8c6d591f25269030c81 100644 (file)
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -15,9 +15,6 @@ OBJ_FILES = uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-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
-
-pydoctor:: pythonmods
-       LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
-
+_PY_FILES = $(shell find scripting/python -name "*.py")
 
+$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))