* python/sps-gdb-local.in: New. * python/Makefile.am (edit): Also substitute @LIBTOOL@. (noinst_SCRIPTS): Add sps-gdb-local. (EXTRA_DIST): Add sps-gdb-local.in. (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. --- swilena/ChangeLog | 10 ++++++++++ swilena/python/Makefile.am | 12 +++++++----- swilena/python/{sps-local.in => sps-gdb-local.in} | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) copy swilena/python/{sps-local.in => sps-gdb-local.in} (73%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index ea9ecab..5712e11 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,15 @@ 2012-08-28 Roland Levillain <roland@lrde.epita.fr> + Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. + + * python/sps-gdb-local.in: New. + * python/Makefile.am (edit): Also substitute @LIBTOOL@. + (noinst_SCRIPTS): Add sps-gdb-local. + (EXTRA_DIST): Add sps-gdb-local.in. + (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. + +2012-08-28 Roland Levillain <roland@lrde.epita.fr> + Fix build dependencies in Swilena. * python/Makefile.am (image2d_point2d-wrap.cc): Depend on diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index ff29d3c..b988cd8 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -40,7 +40,7 @@ AM_LDFLAGS = -avoid-version -module -shared @AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $< -# Use Make to generate `data.py' and shell scripts (`sps' and +# Use Make to generate `data.py' and shell scripts (such as `sps' and # `sps-local') instead of `configure', as advised by Autoconf's manual # (see section ``Installation Directory Variables''). edit = sed \ @@ -50,7 +50,8 @@ edit = sed \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ -e 's|@pythondir[@]|$(pythondir)|g' \ - -e 's|@PYTHON[@]|$(PYTHON)|g' + -e 's|@PYTHON[@]|$(PYTHON)|g' \ + -e 's|@LIBTOOL[@]|$(LIBTOOL)|g' # swilena.py: The whole Swilena suite. @@ -321,11 +322,11 @@ python_PYTHON += sps.py # The script to be used in installed distributions. bin_SCRIPTS = sps # The script to be used in non-installed build trees. -noinst_SCRIPTS = sps-local +noinst_SCRIPTS = sps-local sps-gdb-local -EXTRA_DIST += sps-common.in sps.in sps-local.in +EXTRA_DIST += sps-common.in sps.in sps-local.in sps-gdb-local.in -sps sps-local: Makefile $(srcdir)/sps-common.in +$(bin_SCRIPTS) $(noinst_SCRIPTS): Makefile $(srcdir)/sps-common.in rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ @@ -338,6 +339,7 @@ sps sps-local: Makefile $(srcdir)/sps-common.in sps: $(srcdir)/sps.in sps-local: $(srcdir)/sps-local.in +sps-gdb-local: $(srcdir)/sps-gdb-local.in CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) diff --git a/swilena/python/sps-local.in b/swilena/python/sps-gdb-local.in similarity index 73% copy from swilena/python/sps-local.in copy to swilena/python/sps-gdb-local.in index 88ac50d..f30b3d8 100644 --- a/swilena/python/sps-local.in +++ b/swilena/python/sps-gdb-local.in @@ -3,4 +3,4 @@ # sps local version, for use from non installed distributions. PYTHONPATH='@abs_builddir@:@abs_builddir@/.libs:@abs_srcdir@':"$PYTHONPATH" \ DYLD_LIBRARY_PATH='.libs:@abs_top_builddir@/src/.libs' \ -exec @PYTHON@ -i @abs_srcdir@/sps.py "$@" +exec @LIBTOOL@ --mode=execute gdb --args @PYTHON@ -i @abs_srcdir@/sps.py "$@" -- 1.7.2.5