alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adjust Swig rules for Swig 1.3.24 (and probably 1.3.23 too).

Browse source 
Compiling the runtime in a separate modules is no longer required,
and actually it does not work anymore...
* wrap/python/swigpy.i: Remove.
* wrap/python/Makefile.am (_swigpy.la): Remove all references.
($(srcdir)/spot_wrap.cxx, $(srcdir)/buddy_wrap.cxx): Do not
use -noruntime.
This commit is contained in:
Alexandre Duret-Lutz 2004-12-15 12:59:46 +00:00
parent 73c42db23d
commit b0a51a0656
4 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-12-15 Alexandre Duret-Lutz <adl@src.lip6.fr>
Adjust Swig rules for Swig 1.3.24 (and probably 1.3.23 too).
Compiling the runtime in a separate modules is no longer required,
and actually it does not work anymore...
* wrap/python/swigpy.i: Remove.
* wrap/python/Makefile.am (_swigpy.la): Remove all references.
($(srcdir)/spot_wrap.cxx, $(srcdir)/buddy_wrap.cxx): Do not
use -noruntime.
2004-12-14 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-12-14 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbatest/ltl2tgba.cc: Add option -P. * src/tgbatest/ltl2tgba.cc: Add option -P.

4
HACKING
View file

@ -10,11 +10,11 @@ Here are the tools you need to bootstrap the CVS tree, or more
generally if you plan to regenerate some of the generated files. generally if you plan to regenerate some of the generated files.
GNU Autoconf >= 2.59 GNU Autoconf >= 2.59
GNU Automake >= 1.8 GNU Automake >= 1.9
GNU Libtool >= 1.4 GNU Libtool >= 1.4
GNU Flex (the version probably doesn't matter much, we used 2.5.31) GNU Flex (the version probably doesn't matter much, we used 2.5.31)
The CVS version of GNU Bison (called 1.875c at the time of writing) The CVS version of GNU Bison (called 1.875c at the time of writing)
SWIG 1.3.21 SWIG >= 1.3.23
Doxygen >= 1.3.5 Doxygen >= 1.3.5
Bootstrap the CVS tree by running Bootstrap the CVS tree by running

31
wrap/python/Makefile.am
View file

@ -23,31 +23,22 @@ SUBDIRS = . cgi tests
AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src $(BUDDY_CPPFLAGS)
EXTRA_DIST = ltihooks.py spot.i buddy.i swigpy.i EXTRA_DIST = ltihooks.py spot.i buddy.i
python_PYTHON = $(srcdir)/spot.py $(srcdir)/buddy.py python_PYTHON = $(srcdir)/spot.py $(srcdir)/buddy.py
pyexec_LTLIBRARIES = _spot.la _buddy.la pyexec_LTLIBRARIES = _spot.la _buddy.la
lib_LTLIBRARIES = libspotswigpy.la
## libspotswigpy is the SWIG runtime common to the other modules.
libspotswigpy_la_SOURCES = $(srcdir)/swigpy_wrap.c
libspotswigpy_la_CFLAGS = -DSWIG_GLOBAL
libspotswigpy_la_LDFLAGS = -avoid-version
$(srcdir)/swigpy_wrap.c: $(srcdir)/swigpy.i
swig -runtime -python $(srcdir)/swigpy.i
rm -f $(srcdir)/swigpy.py
MAINTAINERCLEANFILES = \
$(srcdir)/spot_wrap.cxx $(srcdir)/spot.py \
$(srcdir)/buddy_wrap.cxx $(srcdir)/buddy.py
## spot ## spot
_spot_la_SOURCES = $(srcdir)/spot_wrap.cxx $(srcdir)/spot_wrap.h _spot_la_SOURCES = $(srcdir)/spot_wrap.cxx $(srcdir)/spot_wrap.h
_spot_la_LDFLAGS = -avoid-version -module _spot_la_LDFLAGS = -avoid-version -module
_spot_la_LIBADD = $(top_builddir)/src/libspot.la libspotswigpy.la _spot_la_LIBADD = $(top_builddir)/src/libspot.la
$(srcdir)/spot_wrap.cxx: $(srcdir)/spot.i $(srcdir)/spot_wrap.cxx: $(srcdir)/spot.i
swig -noruntime -c++ -python -I$(srcdir) -I$(top_srcdir)/src $(srcdir)/spot.i swig -c++ -python -I$(srcdir) -I$(top_srcdir)/src $(srcdir)/spot.i
$(srcdir)/spot.py: $(srcdir)/spot.i $(srcdir)/spot.py: $(srcdir)/spot.i
$(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx
@ -57,17 +48,9 @@ $(srcdir)/spot.py: $(srcdir)/spot.i
_buddy_la_SOURCES = $(srcdir)/buddy_wrap.cxx _buddy_la_SOURCES = $(srcdir)/buddy_wrap.cxx
_buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS) _buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS)
_buddy_la_LIBADD = libspotswigpy.la
$(srcdir)/buddy_wrap.cxx: $(srcdir)/buddy.i $(srcdir)/buddy_wrap.cxx: $(srcdir)/buddy.i
swig -noruntime -c++ -python $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i swig -c++ -python $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i
$(srcdir)/buddy.py: $(srcdir)/buddy.i $(srcdir)/buddy.py: $(srcdir)/buddy.i
$(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx
MAINTAINERCLEANFILES = \
$(srcdir)/spot_wrap.cxx $(srcdir)/spot.py \
$(srcdir)/buddy_wrap.cxx $(srcdir)/buddy.py \
$(srcdir)/swigpy_wrap.cxx

1
wrap/python/swigpy.i
View file

@ -1 +0,0 @@
%module swigpy