From 5de599fb26a6dc64359eb70b3c0013815a5117c3 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 10 May 2007 12:16:27 +0000 Subject: [PATCH] INTEGRATION: CWS libxslt02 (1.9.44); FILE MERGED 2006/12/24 09:06:47 cmc 1.9.44.1: #i30380 enable xslt usage by default --- xmlhelp/util/makefile.mk | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 52bc99371c5f..c8ab092c4c56 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2006-01-05 18:18:15 $ +# last change: $Author: kz $ $Date: 2007-05-10 13:16:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,15 +53,6 @@ NO_BSYMBOLIC=TRUE CFLAGS+=-GR .ENDIF -.IF "$(SABLOT3RDLIB)"=="" -.IF "$(GUI)"=="UNX" -SABLOT3RDLIB=-lsablot -.ENDIF # unx -.IF "$(GUI)"=="WNT" -SABLOT3RDLIB=sablot.lib -.ENDIF # wnt -.ENDIF # sablot3rdlib - # --- Shared-Library --------------------------------------------------- SHL1TARGET=$(TARGET)$(UCP_VERSION) @@ -75,12 +66,11 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(SALLIB) \ $(VOSLIB) \ - $(SABLOT3RDLIB) \ $(EXPATASCII3RDLIB) \ $(UCBHELPERLIB) \ - $(SVLLIB) \ - $(BERKELEYLIB) -# $(BERKELEYCPPLIB) + $(SVLLIB) \ + $(BERKELEYLIB) \ + $(XSLTLIB) SHL1LIBS = \ $(SLB)$/jaqe.lib \