diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 14:11:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 14:11:14 +0000 |
| commit | 755474e0596be20cae1b6cb88ee223dbc94ea79c (patch) | |
| tree | a84815180f5c2acfbff9f8dcb924ce70580c6ac9 /solenv/inc/tg_def.mk | |
| parent | 8b4e3290d52e311544761c700551266059ff5769 (diff) | |
INTEGRATION: CWS pchfix04 (1.35.4); FILE MERGED
2007/04/25 20:39:44 hjs 1.35.4.4: RESYNC: (1.36-1.37); FILE MERGED
2007/02/02 10:45:25 hjs 1.35.4.3: #i72289# missed one place for multi-lib suppert
2007/02/02 09:54:56 hjs 1.35.4.2: RESYNC: (1.35-1.36); FILE MERGED
2007/02/02 09:44:16 hjs 1.35.4.1: #i72289# multiple libs for export detection to avoid hitting a filesize limit for .lib files with changed debug switches
Diffstat (limited to 'solenv/inc/tg_def.mk')
| -rw-r--r-- | solenv/inc/tg_def.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 61385b6c7902..efe62babaa00 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_def.mk,v $ # -# $Revision: 1.37 $ +# $Revision: 1.38 $ # -# last change: $Author: vg $ $Date: 2007-03-26 14:45:23 $ +# last change: $Author: kz $ $Date: 2007-05-10 15:11:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,7 @@ DEFLIB$(TNR)NAME*=$(DEF$(TNR)LIBNAME) .IF "$(DEFLIB$(TNR)NAME)"!="" .IF "$(UPDATER)"!="" -DEF$(TNR)DEPN+=$(SLB)$/$(DEFLIB$(TNR)NAME).lib +DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) .ENDIF # "$(UPDATER)"!="" .ENDIF @@ -138,7 +138,7 @@ $(DEF$(TNR)TARGETN) .PHONY : .ENDIF $(EXPORT$(TNR)_PROTECT) $(RMHACK$(TNR)) $(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 + @$(EXPORT$(TNR)_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct .IF "$(DEF$(TNR)CEXP)"!="" @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -D -A $(DEF$(TNR)CEXP) -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile .ELSE |