diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:03:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:03:22 +0000 |
| commit | 6c3183c1e69b20ed32deb7c8e8918ffe4b874660 (patch) | |
| tree | 1db0400f9daae9015fdebac886a17b6b6d7d7bf4 /registry | |
| parent | 5bc41de739143ab25405ba06edfda90c2ce7d12b (diff) | |
INTEGRATION: CWS supdremove02 (1.6.12); FILE MERGED
2008/01/28 15:14:08 rt 1.6.12.1: #i85482# Remove UPD from library name
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/test/makefile.mk | 12 | ||||
| -rw-r--r-- | registry/workben/makefile.mk | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/registry/test/makefile.mk b/registry/test/makefile.mk index 9ed0fcf3774b..190e7f48713f 100644 --- a/registry/test/makefile.mk +++ b/registry/test/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2007-11-02 13:16:26 $ +# last change: $Author: obo $ $Date: 2008-02-25 16:02:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,7 @@ USE_LDUMP2=TRUE # ------------------------------------------------------------------ -CDEFS += -DDLL_VERSION=$(EMQ)"$(UPD)$(DLLPOSTFIX)$(EMQ)" +CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)" CXXFILES= \ testregcpp.cxx \ @@ -61,7 +61,7 @@ LIB1OBJFILES= \ $(SLO)$/testmerge.obj -SHL1TARGET= rgt$(UPD)$(DLLPOSTFIX) +SHL1TARGET= rgt$(DLLPOSTFIX) SHL1IMPLIB= rgt SHL1STDLIBS= \ $(SALLIB) \ @@ -73,7 +73,7 @@ SHL1DEPN= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -DEF1DEPN =$(MISC)$/rgt$(UPD)$(DLLPOSTFIX).flt $(SLOFILES) +DEF1DEPN =$(MISC)$/rgt$(DLLPOSTFIX).flt $(SLOFILES) DEFLIB1NAME =$(TARGET) DEF1DES =Registry Runtime - TestDll @@ -87,7 +87,7 @@ DEF1DES =Registry Runtime - TestDll # --- SO2-Filter-Datei --- -$(MISC)$/rgt$(UPD)$(DLLPOSTFIX).flt: +$(MISC)$/rgt$(DLLPOSTFIX).flt: @echo ------------------------------ @echo Making: $@ @echo WEP>$@ diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk index 349a88be8f73..5d9985daa78a 100644 --- a/registry/workben/makefile.mk +++ b/registry/workben/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2007-11-02 13:17:02 $ +# last change: $Author: obo $ $Date: 2008-02-25 16:03:22 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,11 +44,11 @@ LIBTARGET=NO .INCLUDE : settings.mk # --- Files -------------------------------------------------------- -CDEFS += -DDLL_VERSION=$(EMQ)"$(UPD)$(DLLPOSTFIX)$(EMQ)" +CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)" RGTLIB = rgt.lib .IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2" -RGTLIB = -lrgt$(UPD)$(DLLPOSTFIX) +RGTLIB = -lrgt$(DLLPOSTFIX) .ENDIF |