From ffd12785f15d8522eda62e59a1b2a43126677208 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 27 Sep 2007 11:54:10 +0000 Subject: INTEGRATION: CWS sb76 (1.3.32); FILE MERGED 2007/08/31 11:01:20 sb 1.3.32.1: #i77885# Consolidate stoc libraries; patch by jnavrati. --- xmlsecurity/tools/standalone/csfit/util/makefile.mk | 12 +++--------- xmlsecurity/tools/standalone/mscsfit/util/makefile.mk | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk index 8b1c9d0a422b..c6f4a9b47114 100644 --- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk +++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:24:45 $ +# last change: $Author: hr $ $Date: 2007-09-27 12:53:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,18 +70,12 @@ REGISTERLIBS= \ # Additional libraries DLLPRE_NO= REGISTERLIBS+= \ - $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \ $(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \ $(DLLPRE_NO)namingservice.uno$(DLLPOST) \ - $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \ + $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \ $(DLLPRE)xsec_fw$(DLLPOST) \ $(DLLPRE)xsec_xmlsec$(DLLPOST) -# $(DLLPRE)implreg.uno$(DLLPOST) \ -# $(DLLPRE)nestedreg.uno$(DLLPOST) \ -# $(DLLPRE)simplereg.uno$(DLLPOST) \ - - .IF "$(GUI)" == "UNX" MY_DLLDIR=$(SOLARLIBDIR) REGISTERLIBS+= \ diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk index 6047cd5fa408..0587b3ce9495 100644 --- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk +++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:24:58 $ +# last change: $Author: hr $ $Date: 2007-09-27 12:54:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,18 +70,12 @@ REGISTERLIBS= \ # Additional libraries DLLPRE_NO= REGISTERLIBS+= \ - $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \ $(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \ $(DLLPRE_NO)namingservice.uno$(DLLPOST) \ - $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \ + $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \ $(DLLPRE)xsec_fw$(DLLPOST) \ $(DLLPRE)xsec_xmlsec$(DLLPOST) -# $(DLLPRE)implreg.uno$(DLLPOST) \ -# $(DLLPRE)nestedreg.uno$(DLLPOST) \ -# $(DLLPRE)simplereg.uno$(DLLPOST) \ - - .IF "$(GUI)" == "UNX" MY_DLLDIR=$(SOLARLIBDIR) REGISTERLIBS+= \ -- cgit