| diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/jade/Makefile.sub /tmp/buffer-content-5978gFR |
| --- a/jade/Makefile.sub 2009-11-19 17:21:46.000000000 -0500 |
| +++ b/jade/Makefile.sub 2009-11-19 17:23:24.000000000 -0500 |
| @@ -4,7 +4,8 @@ |
| 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 ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a |
| +XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a -losp |
| +EXT_LIBS=-L$(splibdir) -losp $(LIBS) |
| 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 |
| |
| |
| diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/Makefile.prog.in /tmp/buffer-content-5978T7K |
| --- a/Makefile.prog.in 2002-01-22 06:57:53.000000000 -0500 |
| +++ b/Makefile.prog.in 2009-11-19 17:23:05.000000000 -0500 |
| @@ -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) $(EXT_LIBS) |
| |
| install: $(PROG) |
| -test -d $(DESTDIR)$(bindir) || \ |
| |
