summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/make/python.mk3
-rw-r--r--source4/scripting/python/config.mk9
2 files changed, 5 insertions, 7 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index e5a5b87ae5..ea307da73d 100644
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -46,9 +46,6 @@ 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
-
bin/python/%.py:
mkdir -p $(@D)
cp $< $@
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 0b495260bd..d36e136346 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -27,10 +27,11 @@ _PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -type f -
$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(subst ../lib/subunit/python,,$(pyfile))),$(pyfile))))
-EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
-
-epydoc:: pythonmods
- PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit testtools dnspython
+PYDOCTOR = pydoctor
+PYDOCTOR_OPTIONS = --project-name Samba --project-url http://www.samba.org/ \
+ --make-html
+pydoctor:: pythonmods
+ LD_LIBRARY_PATH=bin/shared PYTHONPATH=$(pythonbuilddir) pydoctor --project-name=Samba --project-url=http://www.samba.org/ --make-html --docformat=restructuredtext $(addprefix --add-package $(pythonbuilddir)/, samba)
install:: installpython