--- openjade-1.3.2/jade/Makefile.sub.orig-osp-nolt	2002-11-16 01:46:50 +0300

+++ openjade-1.3.2/jade/Makefile.sub	2003-12-17 23:48:56 +0300

@@ -2,9 +2,8 @@

 OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuilder.o HtmlFOTBuilder.o \

   TeXFOTBuilder.o TransformFOTBuilder.o MifFOTBuilder.o

 INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style

-# XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \

-#   ../lib/libosp.a

-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a

+XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a

+SP_LIBS=-L$(splibdir) -losp

 GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \

  HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \

  TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx

--- openjade-1.3.2/Makefile.prog.in.orig-osp-nolt	2002-01-22 14:57:53 +0300

+++ openjade-1.3.2/Makefile.prog.in	2003-12-17 23:57:37 +0300

@@ -10,16 +10,15 @@

 top_builddir=@TOP@

 LINKFLAGS = @LINKFLAGS@

-ALL_LIBS = $(XLIBS) $(LIBS)

 Makefile.lt:

-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt

+	echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt

 PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')

 all: $(PROG)

 $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)

-	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)

+	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(SP_LIBS) $(LIBS)

 install: $(PROG)

 	-test -d $(DESTDIR)$(bindir) || \