strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause044 (1.92.102); FILE MERGED

Browse source 
2005/11/28 18:54:15 hjs 1.92.102.1: #i58388# .INIT depends on version object; SHLnTARGETN doesn't any longer
This commit is contained in:
Rüdiger Timm 2005-12-14 14:37:49 +00:00
parent 55868b73fe
commit c576ca24b0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
solenv/inc/tg_shl.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: tg_shl.mk,v $ # $RCSfile: tg_shl.mk,v $
# #
# $Revision: 1.92 $ # $Revision: 1.93 $
# #
# last change: $Author: rt $ $Date: 2005-09-08 09:48:54 $ # last change: $Author: rt $ $Date: 2005-12-14 15:37:49 $
# #
# 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.
@ -128,13 +128,14 @@ SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/$(LOCAL$(TNR)DESC:b)$($(WINVERSIONNAMES)_MAJOR)
SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)$/_version.h USE_VERSIONH:=$(INCCOM)$/_version.h
.IF "$(GUI)" == "UNX" .IF "$(GUI)" == "UNX"
SHL$(TNR)DEPN+=$(SHL$(TNR)VERSIONOBJ:s/.o/.obj/) SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
.ELSE # "$(GUI)" == "UNX" .ELSE # "$(GUI)" == "UNX"
SHL$(TNR)DEPN+=$(SHL$(TNR)VERSIONOBJ) SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/_version.h $(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/_version.h
+$(COPY) $(SOLARENV)$/src$/version.c $@ +$(COPY) $(SOLARENV)$/src$/version.c $@
.INIT : $(SHL$(TNR)VERSIONOBJDEP)
.ENDIF # "$(VERSIONOBJ)"!="" .ENDIF # "$(VERSIONOBJ)"!=""
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
@ -293,7 +294,6 @@ $(SHL$(TNR)TARGETN) : \
$(USE_SHL$(TNR)DEF)\ $(USE_SHL$(TNR)DEF)\
$(USE_SHL$(TNR)VERSIONMAP)\ $(USE_SHL$(TNR)VERSIONMAP)\
$(SHL$(TNR)RES)\ $(SHL$(TNR)RES)\
$(SHL$(TNR)VERSIONH)\
$(SHL$(TNR)DEPN) \ $(SHL$(TNR)DEPN) \
$(SHL$(TNR)LINKLIST) $(SHL$(TNR)LINKLIST)
@echo ------------------------------ @echo ------------------------------