diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:50:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:50:23 +0000 |
| commit | c104e7b5ae8316292b0727c65bb09e8dd73cff0b (patch) | |
| tree | 14e87f4d9cf81541108010db3383535934348ced /solenv/inc/tg_def.mk | |
| parent | b026062c0541e741f7a709a41f003452376ef316 (diff) | |
INTEGRATION: CWS ause079 (1.38.2); FILE MERGED
2007/06/11 14:36:49 hjs 1.38.2.2: RESYNC: (1.38-1.39); FILE MERGED
2007/05/22 11:22:49 hjs 1.38.2.1: #i77083# support SHLnUSE_EXPORTS=name
Diffstat (limited to 'solenv/inc/tg_def.mk')
| -rw-r--r-- | solenv/inc/tg_def.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 48d535abb769..fa199c037a23 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_def.mk,v $ # -# $Revision: 1.40 $ +# $Revision: 1.41 $ # -# last change: $Author: hr $ $Date: 2007-06-26 17:34:03 $ +# last change: $Author: hr $ $Date: 2007-06-27 17:50:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -125,7 +125,7 @@ $(DEF$(TNR)TARGETN) .PHONY : 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" +.IF "$(SHL$(TNR)USE_EXPORTS)"=="" @-$(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 .IF "$(DEF$(TNR)CEXP)"!="" @@ -134,14 +134,22 @@ $(DEF$(TNR)TARGETN) .PHONY : @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp >>$@.tmpfile .ENDIF $(EXPORT$(TNR)_PROTECT) $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp -.ELSE # "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" +.ELSE # "$(SHL$(TNR)USE_EXPORTS)"=="" @$(EXPORT$(TNR)_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct +.IF "$(SHL$(TNR)USE_EXPORTS)"!="name" .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 @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile .ENDIF -.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"!="ordinal" +.ELSE # "$(SHL$(TNR)USE_EXPORTS)"!="name" +.IF "$(DEF$(TNR)CEXP)"!="" + @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -N -D -A $(DEF$(TNR)CEXP) -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile +.ELSE + @$(EXPORT$(TNR)_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile +.ENDIF +.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"!="name" +.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="" .ENDIF # now *\defs\$(OUTPATH) exists, commit it .IF "$(MWS_BUILD)"!="" |