summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 16:51:50 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 16:51:50 +0100
commit2ca7dfe20c4a86d0abacf5cafc81a2dd97acc7dd (patch)
tree6d75e3934071dbd322e7f8249c004686d80acd54
parent5874c53eba3d195d4d9017c1b884e9413221f91e (diff)
downloadsamba-2ca7dfe20c4a86d0abacf5cafc81a2dd97acc7dd.tar.gz
samba-2ca7dfe20c4a86d0abacf5cafc81a2dd97acc7dd.tar.bz2
samba-2ca7dfe20c4a86d0abacf5cafc81a2dd97acc7dd.zip
Fix pydoctor.
(This used to be commit 023025e4de119aa234f885aa6e5594660bd8f358)
-rw-r--r--source4/build/make/python.mk3
-rw-r--r--source4/scripting/python/config.mk7
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index bd0926717d..57bf0169fe 100644
--- 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 cafbea6b6e..56634736bd 100644
--- 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))))