diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:45:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:45:23 +0000 |
| commit | 387a93d009ae6975613908cbfa2fa6a9841950bb (patch) | |
| tree | c1de2f681ca7d4d24b498106c9de44b84c265832 /solenv/inc/tg_def.mk | |
| parent | cf2d17ab04c173cac72baabd8b3f16219aec2054 (diff) | |
INTEGRATION: CWS mingwport03 (1.30.86); FILE MERGED
2007/03/21 12:49:26 vg 1.30.86.4: #i53572# fixes for build breakers caused by multiple resync
2007/03/20 13:15:09 vg 1.30.86.3: RESYNC: (1.31-1.36); FILE MERGED
2006/11/07 16:56:17 vg 1.30.86.2: RESYNC: (1.30-1.31); FILE MERGED
2006/10/24 15:35:07 vg 1.30.86.1: #i53572# MinGW port
Diffstat (limited to 'solenv/inc/tg_def.mk')
| -rw-r--r-- | solenv/inc/tg_def.mk | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 950abb6c135b..61385b6c7902 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_def.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # -# last change: $Author: rt $ $Date: 2007-02-01 09:59:38 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:45:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -111,7 +111,9 @@ $(DEF$(TNR)TARGETN) .PHONY : @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL$(TNR)TARGETN:f) >$@.tmpfile +.IF "$(COM)"!="GCC" @echo HEAPSIZE 0 >>$@.tmpfile +.ENDIF @echo EXPORTS >>$@.tmpfile # getversioninfo fuer alle!! @echo GetVersionInfo >>$@.tmpfile @@ -119,6 +121,13 @@ $(DEF$(TNR)TARGETN) .PHONY : @echo component_getDescriptionFunc >>$@.tmpfile .ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"=="" .IF "$(DEFLIB$(TNR)NAME)"!="" +.IF "$(COM)"=="GCC" + @-+$(EXPORT$(TNR)_PROTECT) $(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp + dlltool --output-def $(MISC)$/$(SHL$(TNR)TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB$(TNR)NAME).lib | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` + tail --lines +3 $(MISC)$/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-+$(EXPORT$(TNR)_PROTECT) $(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp +.ELSE .IF "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" @-$(EXPORT$(TNR)_PROTECT) $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp @$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib @@ -136,6 +145,7 @@ $(DEF$(TNR)TARGETN) .PHONY : @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile .ENDIF .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" +.ENDIF # now *\defs\$(OUTPATH) exists, commit it .IF "$(MWS_BUILD)"!="" .IF "$(UPDATER)"!="" @@ -210,8 +220,12 @@ $(DEF$(TNR)TARGETN) .PHONY : @echo $(DEF$(TNR)EXPORT20) >>$@.tmpfile .ENDIF .IF "$(DEF$(TNR)EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + $(TYPE) $(DEF$(TNR)EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile +.ELSE $(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile .ENDIF +.ENDIF @-$(RM) $@ @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" |