diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:42:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:42:56 +0000 |
| commit | b467e6591b23d5dc6bbfbb52c6ccbd5a75574246 (patch) | |
| tree | 5ef2c3f31072648c815005ca3b7ee3fff67b946a /solenv/inc/tg_shl.mk | |
| parent | 887478e27d38e4d1f7e2d5a4ac9787b89031c413 (diff) | |
INTEGRATION: CWS supdremove02 (1.118.56); FILE MERGED
2008/02/05 16:03:47 rt 1.118.56.3: #i85482# Remove UPD from library name.
Undo temporary hack introduced with previous revision.
2008/01/28 12:51:28 rt 1.118.56.2: #i85482# Remove UPD from library name.
For now just strip UPD from macros. Of course for a correct handling all
makefiles have to be changed so that UPD does not get added to naming
scheme at all. This will be done. This change here is just for getting
first results fast.
2008/01/25 15:03:54 rt 1.118.56.1: #i85482# Remove UPD from library names.
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 96c5d5d15099..699b2a8b00a7 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.118 $ +# $Revision: 1.119 $ # -# last change: $Author: hjs $ $Date: 2007-12-07 17:06:25 $ +# last change: $Author: obo $ $Date: 2008-02-25 16:42:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -74,12 +74,12 @@ SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .IF "$(VERSIONOBJ)"!="" -SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) +SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) USE_VERSIONH:=$(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" -SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) +SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" -SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) +SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" $(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h # $(COPY) $(SOLARENV)$/src$/version.c $@ |