[Debian-astro-commits] [gyoto] 163/221: Python: new extension gyoto_loren (wraps only RotStar3_1 so far)

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 618076c72c47251ca62c2735c6ab9021e3aec754
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Fri Dec 19 20:18:10 2014 +0100

    Python: new extension gyoto_loren (wraps only RotStar3_1 so far)
---
 Makefile.in        |  6 +++++-
 configure          |  3 ++-
 configure.ac       |  2 +-
 python/Makefile.in | 20 ++++++++++++++++----
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cde6d73..67a7d56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(top_srcdir)/python/Makefile.in \
 	$(top_srcdir)/python/setup.py.in \
 	$(top_srcdir)/python/setup_std.py.in \
+	$(top_srcdir)/python/setup_lorene.py.in \
 	$(top_srcdir)/doc/doxyfile.in COPYING compile config.guess \
 	config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -114,7 +115,8 @@ CONFIG_HEADER = config.h $(top_builddir)/include/GyotoConfig.h
 CONFIG_CLEAN_FILES = doc/Makefile doc/user_guide/Makefile \
 	yorick/Makefile yorick/stdplug/Makefile yorick/gyoto.info \
 	yorick/yorick1 yorick/setpaths.i gyoto python/Makefile \
-	python/setup.py python/setup_std.py doc/doxyfile
+	python/setup.py python/setup_std.py python/setup_lorene.py \
+	doc/doxyfile
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -482,6 +484,8 @@ python/setup.py: $(top_builddir)/config.status $(top_srcdir)/python/setup.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 python/setup_std.py: $(top_builddir)/config.status $(top_srcdir)/python/setup_std.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+python/setup_lorene.py: $(top_builddir)/config.status $(top_srcdir)/python/setup_lorene.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 doc/doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/doxyfile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
diff --git a/configure b/configure
index 60d22ba..3108694 100755
--- a/configure
+++ b/configure
@@ -19293,7 +19293,7 @@ if test "x$YORICK" != "x"; then :
 fi
 if test "x$PYTHON" != "x"; then :
 
-   ac_config_files="$ac_config_files python/Makefile python/setup.py python/setup_std.py"
+   ac_config_files="$ac_config_files python/Makefile python/setup.py python/setup_std.py python/setup_lorene.py"
 
 
 
@@ -20464,6 +20464,7 @@ do
     "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
     "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;;
     "python/setup_std.py") CONFIG_FILES="$CONFIG_FILES python/setup_std.py" ;;
+    "python/setup_lorene.py") CONFIG_FILES="$CONFIG_FILES python/setup_lorene.py" ;;
     "doc/doxyfile") CONFIG_FILES="$CONFIG_FILES doc/doxyfile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/configure.ac b/configure.ac
index 2c8812e..1628dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,7 +764,7 @@ AS_IF([test "x$YORICK" != "x"],
 )
 AS_IF([test "x$PYTHON" != "x"],
   [
-   AC_CONFIG_FILES([python/Makefile python/setup.py python/setup_std.py])
+   AC_CONFIG_FILES([python/Makefile python/setup.py python/setup_std.py python/setup_lorene.py])
   ]
 )
 AS_IF([test "x$DOXYGEN" != "x" && test "x$mkdoc" == "xyes"],
diff --git a/python/Makefile.in b/python/Makefile.in
index fb89c1b..1f69874 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -81,8 +81,13 @@ export CPPFLAGS
 export CXXFLAGS
 export CC
 
-all: gyoto.py gyoto_std.py _gyoto$(PYTHON_EXTENSION_SUFFIX) \
-	_gyoto_std$(PYTHON_EXTENSION_SUFFIX)
+GYOTO_EXTENSIONS =  _gyoto$(PYTHON_EXTENSION_SUFFIX) \
+                    _gyoto_std$(PYTHON_EXTENSION_SUFFIX)
+GYOTO_PYFILES = gyoto.py gyoto_std.py
+ at HAVE_LORENE_TRUE@GYOTO_EXTENSIONS += _gyoto_lorene$(PYTHON_EXTENSION_SUFFIX)
+ at HAVE_LORENE_TRUE@GYOTO_PYFILES += gyoto_lorene.py
+
+all: $(GYOTO_PYFILES) $(GYOTO_EXTENSIONS)
 
 _gyoto$(PYTHON_EXTENSION_SUFFIX): gyoto_wrap.cxx
 	$(PYTHON) $(srcdir)/setup.py build_ext
@@ -90,6 +95,9 @@ _gyoto$(PYTHON_EXTENSION_SUFFIX): gyoto_wrap.cxx
 _gyoto_std$(PYTHON_EXTENSION_SUFFIX): gyoto_std_wrap.cxx
 	$(PYTHON) $(srcdir)/setup_std.py build_ext
 
+_gyoto_lorene$(PYTHON_EXTENSION_SUFFIX): gyoto_lorene_wrap.cxx
+	$(PYTHON) $(srcdir)/setup_lorene.py build_ext
+
 gyoto.py gyoto_wrap.cxx: gyoto.i header.py
 	swig2.0 -I$(srcdir)/../include -c++ -python  $(srcdir)/gyoto.i
 	mv gyoto.py trailer.py
@@ -99,6 +107,9 @@ gyoto.py gyoto_wrap.cxx: gyoto.i header.py
 gyoto_std.py gyoto_std_wrap.cxx: gyoto_std.i gyoto.i
 	swig2.0 -I$(srcdir)/../include -c++ -python  $(srcdir)/gyoto_std.i
 
+gyoto_lorene.py gyoto_lorene_wrap.cxx: gyoto_std.i gyoto.i
+	swig2.0 -I$(srcdir)/../include -c++ -python  $(srcdir)/gyoto_lorene.i
+
 .PHONY: all install uninstall distclean info install-html html install-pdf pdf install-dvi dvi install-ps ps clean dist check installdirs
 
 
@@ -108,6 +119,7 @@ gyoto_std.py gyoto_std_wrap.cxx: gyoto_std.i gyoto.i
 install: installdirs
 	$(PYTHON) $(srcdir)/setup.py install
 	$(PYTHON) $(srcdir)/setup_std.py install
+ at HAVE_LORENE_TRUE@	$(PYTHON) $(srcdir)/setup_lorene.py install
 ifneq ($(VIRTUALENV),no)
 	$(VIRTUALENV) $(VIRTUALENV_FLAGS) $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
 	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
@@ -133,11 +145,11 @@ uninstall:
 clean:
 	$(PYTHON) setup.py clean
 	-rm -Rf build
-	-rm gyoto.py gyoto_wrap.cxx gyoto_std.py gyoto_std_wrap.cxx
+	-rm gyoto*.py gyoto_wrap*.cxx 
 
 # Clean up the output of configure
 distclean: 
-	-rm -v $(builddir)/setup.py
+	-rm -v $(builddir)/setup*.py
 	-rm -v $(builddir)/Makefile
 
 # You can either use the setup.py sdist command or you can roll your own here

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git