From 16325f13395a48daa9c0a8cb58b354e552776fce Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 Nov 2007 22:41:29 +0100 Subject: r26186: Generate SWIG files as part of autogen.sh (This used to be commit 4429f8b87e057787df0748f93c842c9a634dada5) --- source4/autogen.sh | 12 +++++++++++- source4/main.mk | 2 +- source4/scripting/python/config.mk | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/autogen.sh b/source4/autogen.sh index e5aa69776f..67a3df3bd9 100755 --- a/source4/autogen.sh +++ b/source4/autogen.sh @@ -63,6 +63,16 @@ $AUTOCONF $IPATHS || exit 1 rm -rf autom4te*.cache +# Run swig if it is available +SWIG=swig +SWIG_FILES="./scripting/python/misc.i ./auth/auth.i ./auth/credentials/credentials.i ./lib/talloc/talloc.i ./lib/ldb/ldb.i ./lib/registry/registry.i ./lib/tdb/tdb.i ./libcli/swig/libcli_smb.i ./libcli/swig/libcli_nbt.i ./librpc/rpc/dcerpc.i" +if which $SWIG >/dev/null 2>&1; then + for I in $SWIG_FILES + do + echo "$0: running $SWIG for $I" + swig -python -keyword $I + done +fi + echo "Now run ./configure and then make." exit 0 - diff --git a/source4/main.mk b/source4/main.mk index 6080ab947d..2c1bf86e84 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -279,7 +279,7 @@ distclean: clean removebackup: -rm -f *.bak *~ */*.bak */*~ */*/*.bak */*/*~ */*/*/*.bak */*/*/*~ -realdistclean: distclean removebackup +realdistclean:: distclean removebackup -rm -f include/config_tmp.h.in -rm -f version.h -rm -f configure diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index eb35919450..c396cf62bc 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -22,14 +22,14 @@ swig: pythonmods .i_wrap.c: $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $< -clean:: +realdistclean:: @echo "Removing SWIG output files" @-rm -f bin/python/* # FIXME: Remove _wrap.c files pythonmods: $(PYTHON_DSOS) -PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py +PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py pydoctor:: pythonmods LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES)) -- cgit