[Olena-patches] oln-0.10 10.238: Use SHARED_LDFLAGS in Swilena

2006-07-06 Roland Levillain <roland(a)lrde.epita.fr> Use SHARED_LDFLAGS. * expand.sh (AM_LDFLAGS): Replace -shared with $(SHARED_LDFLAGS). ($base.rb): Remove this (useless) rule. Index: 10.237/tools/swilena/expand.sh --- 10.237/tools/swilena/expand.sh Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/s/25_expand.sh 1.18 700) +++ 10.238/tools/swilena/expand.sh Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/s/25_expand.sh 1.19 700) @@ -88,7 +88,7 @@ INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -180,9 +180,7 @@ INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -# FIXME: Modern versions of swig don't use libswigpy. -#AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -210,13 +208,8 @@ else sdir=meta fi - # Rule generating a C++ (*_wrap.cc) and a Ruby (*.rb) wrappers from a - # SWIG interface. - # - # FIXME: The generation of the Ruby wrapper is separated from - # the one of the C++ wrapper in this version, and that's not good. - # We should use Make's trick for multiple outputs (with timestamps) - # here. + # Rule generating a C++ (*_wrap.cc) wrapper for Ruby from a SWIG + # interface. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" dest="${base}_wrap.cxx" @@ -231,9 +224,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ -$base.rb: $src - \$(MAKE) \$(AM_MAKEFLAGS) $dest - EOF done }