* python/Makefile.am (%-wrap.cc %.py): Do not use `$@' in the
action block to represent the first output, as `$@' may stand for
any target of the rule; instead, rely on an explicit pattern based
on `$*'.
---
swilena/ChangeLog | 9 +++++++++
swilena/python/Makefile.am | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index f92e739..73d22e0 100644
--- a/swilena/ChangeLog
+++ b/swilena/ChangeLog
@@ -1,5 +1,14 @@
2013-04-09 Roland Levillain <roland(a)lrde.epita.fr>
+ Fix Makefile pattern rules generating several tests outputs.
+
+ * python/Makefile.am (%-wrap.cc %.py): Do not use `$@' in the
+ action block to represent the first output, as `$@' may stand for
+ any target of the rule; instead, rely on an explicit pattern based
+ on `$*'.
+
+2013-04-09 Roland Levillain <roland(a)lrde.epita.fr>
+
Help SWIG 2.0.9 wrap a ctor added as an extension.
* box2d.i: Here.
diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am
index 2593ad3..7752bab 100644
--- a/swilena/python/Makefile.am
+++ b/swilena/python/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -32,12 +32,12 @@ AM_LDFLAGS = -avoid-version -module -shared
# Run Swig to create the C++ wrapper files, the Python interface
# files, and the dependency Makefile snippets.
%-wrap.cc %.py: $(top_srcdir)/swilena/%.i
-@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \
+@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $*-wrap.cc $<; then \
@AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\
@AMDEP_TRUE@ else \
@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\
@AMDEP_TRUE@ fi
-@AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $<
+@AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $*-wrap.cc $<
# Use Make to generate `data.py' and shell scripts (such as `sps' and
--
1.7.2.5
* box2d.i: Here.
Drop the namespace qualifier before the class name (see
http://sourceforge.net/p/swig/bugs/1291/).
---
swilena/ChangeLog | 8 ++++++++
swilena/box2d.i | 7 ++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index 8d72bf3..f92e739 100644
--- a/swilena/ChangeLog
+++ b/swilena/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-09 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Help SWIG 2.0.9 wrap a ctor added as an extension.
+
+ * box2d.i: Here.
+ Drop the namespace qualifier before the class name (see
+ http://sourceforge.net/p/swig/bugs/1291/).
+
2012-08-28 Roland Levillain <roland(a)lrde.epita.fr>
Aesthetic changes in Swilena.
diff --git a/swilena/box2d.i b/swilena/box2d.i
index f13790e..11bf2c3 100644
--- a/swilena/box2d.i
+++ b/swilena/box2d.i
@@ -1,5 +1,6 @@
// -*- C++ -*-
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2013 EPITA Research and Development
+// Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -42,8 +43,8 @@
%extend mln::box< mln::point<mln::grid::square, mln::def::coord> >
{
// Provide a ctor creating an `mln::box2d' from two `int's.
- mln::box< mln::point<mln::grid::square, mln::def::coord> > (int nrows,
- int ncols)
+ box< mln::point<mln::grid::square, mln::def::coord> > (int nrows,
+ int ncols)
{
return new mln::box<mln::point2d>(nrows, ncols);
}
--
1.7.2.5