diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-07 16:09:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-07 16:09:10 +0000 |
| commit | 0a0c430881834be341c4ed64d45b5b1c74ef2573 (patch) | |
| tree | 237699188d99268e8a14186c8750b2049634414d /solenv | |
| parent | 54cef42e081bddbc4a1a3377e227b93b96766e5d (diff) | |
INTEGRATION: CWS ause049 (1.93.104); FILE MERGED
2006/02/16 15:35:16 hjs 1.93.104.1: #i62030# give _version.h unique names
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 2f026e66af48..60fa1af149b1 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.93 $ +# $Revision: 1.94 $ # -# last change: $Author: rt $ $Date: 2005-12-14 15:37:49 $ +# last change: $Author: rt $ $Date: 2006-03-07 17:09:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -126,14 +126,15 @@ SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/$(LOCAL$(TNR)DESC:b)$($(WINVERSIONNAMES)_MAJOR) .IF "$(VERSIONOBJ)"!="" SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/_version.h +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/) .ELSE # "$(GUI)" == "UNX" SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/_version.h - +$(COPY) $(SOLARENV)$/src$/version.c $@ +$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h +# +$(COPY) $(SOLARENV)$/src$/version.c $@ + +$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@ .INIT : $(SHL$(TNR)VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" |