* int_u24.i: Remove. * Makefile.am (wrappers): Remove int_u32.i. * python/Makefile.am: No longer generate Python wrapper from int_u32.i. --- swilena/ChangeLog | 9 +++++++++ swilena/Makefile.am | 1 - swilena/int_u32.i | 40 ---------------------------------------- swilena/python/Makefile.am | 10 ---------- 4 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 swilena/int_u32.i diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f1a243b..7a0142c 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-05 Roland Levillain <roland@lrde.epita.fr> + No longer wrap mln::value::int_u32. + + * int_u24.i: Remove. + * Makefile.am (wrappers): Remove int_u32.i. + * python/Makefile.am: No longer generate Python wrapper from + int_u32.i. + +2012-10-05 Roland Levillain <roland@lrde.epita.fr> + Fix Swilena's build. * image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid diff --git a/swilena/Makefile.am b/swilena/Makefile.am index ee2d642..908f016 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -44,7 +44,6 @@ wrappers = \ image2d_int.i \ image2d_int_u8.i \ int_u24.i \ - int_u32.i \ int_u8.i \ neighb2d.i \ point2d.i \ diff --git a/swilena/int_u32.i b/swilena/int_u32.i deleted file mode 100644 index b11662b..0000000 --- a/swilena/int_u32.i +++ /dev/null @@ -1,40 +0,0 @@ -// -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -/// \file int_u32.i -/// \brief A wrapper of mln::value::int_u32. - -%module int_u32 - -%include "int_u.ixx" - -%{ -#include "mln/value/int_u32.hh" -%} - -%include "mln/value/int_u32.hh" - -%template (int_u32) mln::value::int_u<32>; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 6bdc815..a49b78c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -135,16 +135,6 @@ CLEANFILES += $(nodist__int_u24_la_SOURCES) int_u24.py int_u24.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u24-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u24.py -## int_u32. -pyexec_LTLIBRARIES += _int_u32.la -nodist__int_u32_la_SOURCES = int_u32-wrap.cc -_int_u32_la_LIBADD = $(AM_LIBADD) -CLEANFILES += $(nodist__int_u32_la_SOURCES) int_u32.py int_u32.py[co] -## Include the dependency files. Copied from Automake's generated -## case for C++. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u32-wrap.Pcc@am__quote@ -nodist_python_PYTHON += int_u32.py - ## neighb2d. pyexec_LTLIBRARIES += _neighb2d.la nodist__neighb2d_la_SOURCES = neighb2d-wrap.cc -- 1.7.2.5