summaryrefslogtreecommitdiff
blob: d557a80020881b9b1b5491d06020ee65644a6ec4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Index: openjade-1.3.2/jade/Makefile.sub
===================================================================
--- openjade-1.3.2.orig/jade/Makefile.sub
+++ openjade-1.3.2/jade/Makefile.sub
@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
 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 ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
 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
Index: openjade-1.3.2/spgrove/Makefile.sub
===================================================================
--- openjade-1.3.2.orig/spgrove/Makefile.sub
+++ openjade-1.3.2/spgrove/Makefile.sub
@@ -1,9 +1,9 @@
 LTVERSION=0:1:0
 LIB=ospgrove
 INCLUDE=-I$(srcdir)/../grove
-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
-	-L$(TOP)/lib -L$(TOP)/lib/.libs \
-	$(LIB_THREADS)
+DEPLIBS=-lm -L$(TOP)/lib -L$(TOP)/lib/.libs \
+	-L$(TOP)/grove -L$(TOP)/grove/.libs \
+	$(TOP)/grove/libogrove.la $(LIB_THREADS)
 OBJS=GroveApp.o GroveBuilder.o SdNode.o
 GENSRCS=grove_inst.cxx