mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS supdremove02 (1.5.22); FILE MERGED

Browse Source 
2008/01/28 08:09:32 rt 1.5.22.1: #i85482# Remove UPD from library name
This commit is contained in:
Oliver Bolte
2008-02-25 14:41:52 +00:00
parent 5df228d957
commit c3cde7e8cb
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
View File

@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.5 $ # $Revision: 1.6 $
# #
# last change: $Author: rt $ $Date: 2007-11-06 15:48:19 $ # last change: $Author: obo $ $Date: 2008-02-25 15:41:52 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,6 @@ PRJNAME=xmlsecurity
TARGET=xmlsecurity-mscsfit-boot TARGET=xmlsecurity-mscsfit-boot
TARGETTYPE=GUI TARGETTYPE=GUI
VERSION=$(UPD)
GEN_HID=TRUE GEN_HID=TRUE
APP2NOSAL=TRUE APP2NOSAL=TRUE
@@ -59,12 +58,12 @@ ALLTAR : $(BIN)$/boot_services.rdb
REGISTERLIBS= \ REGISTERLIBS= \
i18npool.uno$(DLLPOST) \ i18npool.uno$(DLLPOST) \
$(DLLPRE)tk$(UPD)$(DLLPOSTFIX)$(DLLPOST) \ $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST) \
$(DLLPRE)mcnttype$(DLLPOST) $(DLLPRE)mcnttype$(DLLPOST)
# $(DLLPRE)i18n$(UPD)$(DLLPOSTFIX)$(DLLPOST) \ # $(DLLPRE)i18n$(DLLPOSTFIX)$(DLLPOST) \
# $(DLLPRE)i18npool$(UPD)$(DLLPOSTFIX)$(DLLPOST) \ # $(DLLPRE)i18npool$(DLLPOSTFIX)$(DLLPOST) \
# $(DLLPRE)tk$(UPD)$(DLLPOSTFIX)$(DLLPOST) \ # $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST) \
# $(DLLPRE)mcnttype$(DLLPOST) # $(DLLPRE)mcnttype$(DLLPOST)
# Additional libraries # Additional libraries
@@ -79,7 +78,7 @@ REGISTERLIBS+= \
.IF "$(GUI)" == "UNX" .IF "$(GUI)" == "UNX"
MY_DLLDIR=$(SOLARLIBDIR) MY_DLLDIR=$(SOLARLIBDIR)
REGISTERLIBS+= \ REGISTERLIBS+= \
$(DLLPRE)dtransX11$(UPD)$(DLLPOSTFIX)$(DLLPOST) $(DLLPRE)dtransX11$(DLLPOSTFIX)$(DLLPOST)
.ELSE # "$(GUI)" == "UNX" .ELSE # "$(GUI)" == "UNX"
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"