diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2007-01-29 09:52:01 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2007-01-29 09:52:01 +0000 |
| commit | 8499b7b3d8e11eebc5be1aec2c18be82e4812f09 (patch) | |
| tree | 38bddb197642c12cd26879ba19d28b29493e19a0 /solenv/inc/tg_def.mk | |
| parent | 618a111d86f5c8b0f6138799a553c42da67f1613 (diff) | |
#i10000# .def generation on 4nt worked on MWS builds only...
Diffstat (limited to 'solenv/inc/tg_def.mk')
| -rw-r--r-- | solenv/inc/tg_def.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 577d5c3f0e0d..389ec6a70cf0 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_def.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: hjs $ $Date: 2007-01-25 18:40:25 $ +# last change: $Author: hjs $ $Date: 2007-01-29 10:52:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,10 @@ BUILD_DRIVE$(TNR):=$(shell echo %_disk) .IF "$(BUILD_DRIVE$(TNR))"=="O" # in case of RE build, protect against failed lock -EXPORT$(TNR)_PROTECT=$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && +EXPORT$(TNR)_PROTECT=$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && +RMHACK:=$(RM:s/+//) +.ELSE # "$(BUILD_DRIVE$(TNR))"=="O" +RMHACK:=$(RM) .ENDIF # "$(BUILD_DRIVE$(TNR))"=="O" .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" @@ -117,14 +120,14 @@ $(DEF$(TNR)TARGETN) .PHONY : .ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"=="" .IF "$(DEFLIB$(TNR)NAME)"!="" .IF "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" - @-$(EXPORT$(TNR)_PROTECT) $(RM:s/+//) $(MISC)$/$(SHL$(TNR)TARGET).exp + @-$(EXPORT$(TNR)_PROTECT) $(RMHACK) $(MISC)$/$(SHL$(TNR)TARGET).exp @$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib .IF "$(DEF$(TNR)CEXP)"!="" @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -A $(DEF$(TNR)CEXP) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp >>$@.tmpfile .ELSE @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp >>$@.tmpfile .ENDIF - $(EXPORT$(TNR)_PROTECT) $(RM:s/+//) $(MISC)$/$(SHL$(TNR)TARGET).exp + $(EXPORT$(TNR)_PROTECT) $(RMHACK) $(MISC)$/$(SHL$(TNR)TARGET).exp .ELSE # "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" @$(EXPORT$(TNR)_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB$(TNR)NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct .IF "$(DEF$(TNR)CEXP)"!="" |