patches/openjade/openjade-1.3.2-libosp-la.patch

   1 diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/jade/Makefile.sub /tmp/buffer-content-5978gFR
   2 --- a/jade/Makefile.sub 2009-11-19 17:21:46.000000000 -0500
   3 +++ b/jade/Makefile.sub 2009-11-19 17:23:24.000000000 -0500
   4 @@ -4,7 +4,8 @@
   5  INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
   6  # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
   7  #   ../lib/libosp.a
   8 -XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
   9 +XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a -losp
  10 +EXT_LIBS=-L$(splibdir) -losp $(LIBS)
  11  GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
  12   HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
  13   TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
  14
  15
  16 diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/Makefile.prog.in /tmp/buffer-content-5978T7K
  17 --- a/Makefile.prog.in  2002-01-22 06:57:53.000000000 -0500
  18 +++ b/Makefile.prog.in  2009-11-19 17:23:05.000000000 -0500
  19 @@ -10,16 +10,15 @@
  20  top_builddir=@TOP@
  21  LINKFLAGS = @LINKFLAGS@
  22
  23 -ALL_LIBS = $(XLIBS) $(LIBS)
  24  Makefile.lt:
  25 -       echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
  26 +       echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
  27
  28  PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
  29
  30  all: $(PROG)
  31
  32  $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
  33 -       $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
  34 +       $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(EXT_LIBS)
  35
  36  install: $(PROG)
  37         -test -d $(DESTDIR)$(bindir) || \
  38