INTEGRATION: CWS mba30patches01 (1.10.14); FILE MERGED
2008/04/23 10:54:17 mba 1.10.14.2: RESYNC: (1.10-1.11); FILE MERGED 2008/03/18 15:44:25 mba 1.10.14.1: #i85097#: so library moved to binfilter, no libso any longer
This commit is contained in:
parent
64af51d32e
commit
cdeaeb4489
1 changed files with 3 additions and 2 deletions
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.11 $
|
||||
# $Revision: 1.12 $
|
||||
#
|
||||
# This file is part of OpenOffice.org.
|
||||
#
|
||||
|
@ -106,7 +106,6 @@ $(MISC)$/$(TARGET)-common : makefile.mk
|
|||
@-echo $(DLLPRE)go$(DFTDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)sb$(DFTDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)so$(DFTDLLPOST) >> $@
|
||||
#
|
||||
@-echo $(DLLPRE)fwe$(DFTDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)fwk$(DFTDLLPOST) >> $@
|
||||
|
@ -118,12 +117,14 @@ $(MISC)$/$(TARGET)-common : makefile.mk
|
|||
@-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)sot$(DFTDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)psp$(DFTDLLPOST) >> $@
|
||||
.IF "$(USE_SYSTEM_STL)"!="YES"
|
||||
.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
|
||||
@-echo $(DLLPRE)stlport_gcc$(DLLPOST) >> $@
|
||||
.ENDIF # gcc
|
||||
.IF "$(COMNAME)" == "sunpro5"
|
||||
@-echo $(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
|
||||
.ENDIF # sunpro5
|
||||
.ENDIF
|
||||
@-echo $(DLLPRE)uno_sal$(UDKDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@
|
||||
@-echo $(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
|
||||
|
|
Loading…
Reference in a new issue