mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally, gut the vos module out of the build

Browse Source
This commit is contained in:
Norbert Thiebaud
2010-10-21 16:23:57 -05:00
parent e042951f36
commit e73dde5fb4
17 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
UnoControls/source/base/makefile.mk
View File

@@ -52,7 +52,6 @@ SLOFILES= $(SLO)$/multiplexer.obj \
# $(ONELIB) \ # $(ONELIB) \
# $(USRLIB) \ # $(USRLIB) \
# $(UNOLIB) \ # $(UNOLIB) \
# $(VOSLIB) \
# $(OSLLIB) \ # $(OSLLIB) \
# $(TOOLSLIB) \ # $(TOOLSLIB) \
# $(RTLLIB) # $(RTLLIB)

2
automation/source/mozillaserver/makefile.mk
View File

@@ -109,7 +109,7 @@ UNOTYPES= \
#SHL1TARGET=iserverproxy #SHL1TARGET=iserverproxy
#SHL1STDLIBS= \ #SHL1STDLIBS= \
# $(VOSLIB) $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \ # $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
# $(CPPULIB) \ # $(CPPULIB) \
# $(CPPUHELPERLIB) \ # $(CPPUHELPERLIB) \
# $(UNOLIB) \ # $(UNOLIB) \

11
automation/util/makefile.mk
View File

@@ -55,7 +55,6 @@ SHL1STDLIBS= \
$(SVLLIB) \ $(SVLLIB) \
$(VCLLIB) \ $(VCLLIB) \
$(BASICLIB) \ $(BASICLIB) \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(CPPULIB) \ $(CPPULIB) \
@@ -86,7 +85,6 @@ SHL2IMPLIB= isimplecm
SHL2STDLIBS= \ SHL2STDLIBS= \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB) $(SALLIB)
@@ -109,9 +107,7 @@ SHL3STDLIBS= \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(SVLLIB) \ $(SVLLIB) \
$(VCLLIB) \ $(VCLLIB) \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(SIMPLECMLIB) $(SIMPLECMLIB)
@@ -153,7 +149,6 @@ APP1STDLIBS+= \
$(SVLLIB) \ $(SVLLIB) \
$(VCLLIB) \ $(VCLLIB) \
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(UCBHELPERLIB) \ $(UCBHELPERLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(BASICLIB) \ $(BASICLIB) \
@@ -162,7 +157,7 @@ APP1STDLIBS+= \
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
APP1STDLIBS+= \ APP1STDLIBS+= \
$(VOSLIB) $(SALLIB) $(BASICLIB) $(SALLIB) $(BASICLIB)
APP1STDLIBS+=$(CPPULIB) APP1STDLIBS+=$(CPPULIB)
.ENDIF .ENDIF
.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC" .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
@@ -221,10 +216,10 @@ APP3STDLIBS= \
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
APP3STDLIBS+= \ APP3STDLIBS+= \
$(VOSLIB) $(SALLIB) $(LIBSTLPORT) $(SALLIB) $(LIBSTLPORT)
.ELSE .ELSE
APP3STDLIBS+= \ APP3STDLIBS+= \
$(VOSLIB) $(SALLIB) $(SALLIB)
.ENDIF .ENDIF
.ENDIF .ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET # $(AUTOMATIONLIB) is build in SHL1TARGET

1
cui/util/makefile.mk
View File

@@ -75,7 +75,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \ $(UCBHELPERLIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(JVMFWKLIB) \ $(JVMFWKLIB) \
$(ICUUCLIB) $(ICUUCLIB)

2
extensions/source/ole/makefile.mk
View File

@@ -71,7 +71,6 @@ OWNGUIDCDEFS+= -DOWNGUID
SHL1TARGET=$(TARGET) SHL1TARGET=$(TARGET)
SHL1STDLIBS=\ SHL1STDLIBS=\
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(OLE32LIB) \ $(OLE32LIB) \
@@ -99,7 +98,6 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp
SHL2TARGET=$(TARGET2) SHL2TARGET=$(TARGET2)
SHL2STDLIBS=\ SHL2STDLIBS=\
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(OLE32LIB) \ $(OLE32LIB) \

1
extensions/source/plugin/aqua/makefile.mk
View File

@@ -62,7 +62,6 @@ SLOFILES=\
#APP1OBJS=$(OBJFILES) #APP1OBJS=$(OBJFILES)
#APP1STDLIBS=\ #APP1STDLIBS=\
# $(TOOLSLIB) \ # $(TOOLSLIB) \
# $(VOSLIB) \
# $(SALLIB) # $(SALLIB)
#APP1DEF= $(MISC)$/$(TARGET).def #APP1DEF= $(MISC)$/$(TARGET).def

7
extensions/source/plugin/unx/makefile.mk
View File

@@ -69,9 +69,8 @@ OBJFILES=\
APP1TARGET=pluginapp.bin APP1TARGET=pluginapp.bin
APP1OBJS=$(OBJFILES) APP1OBJS=$(OBJFILES)
APP1STDLIBS=\ APP1STDLIBS= $(SALLIB)
$(VOSLIB) \
$(SALLIB)
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX" .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
.ELSE .ELSE
@@ -98,7 +97,7 @@ DIRECT :=-z nodefs $(DIRECT)
.ENDIF .ENDIF
.ENDIF # "$(PKGCONFIG_ROOT)"!="" .ENDIF # "$(PKGCONFIG_ROOT)"!=""
.ENDIF .ENDIF
APP1DEF= $(MISC)$/$(TARGET).def APP1DEF= $(MISC)$/$(TARGET).def

1
extensions/source/plugin/util/makefile.mk
View File

@@ -87,7 +87,6 @@ SHL1STDLIBS+= \
$(SVLLIB) \ $(SVLLIB) \
$(UNOTOOLSLIB) \ $(UNOTOOLSLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(VOSLIB) \
$(UCBHELPERLIB) \ $(UCBHELPERLIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(CPPULIB) \ $(CPPULIB) \

1
extensions/source/scanner/makefile.mk
View File

@@ -70,7 +70,6 @@ SHL1STDLIBS=\
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(ONELIB) \ $(ONELIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \

4
extensions/source/update/tools/makefile.mk
View File

@@ -52,9 +52,9 @@ APP1STDLIBS = $(TOOLSLIB)
#APP2TARGET = urltest #APP2TARGET = urltest
#APP2OBJS = $(OBJ)$/urltest.obj #APP2OBJS = $(OBJ)$/urltest.obj
#.IF "$(GUI)" == "UNX" #.IF "$(GUI)" == "UNX"
#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) #APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
#.ELSE #.ELSE
#APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib #APP2STDLIBS = $(LB)$/itools.lib isal.lib icppu.lib icppuhelper.lib
#.ENDIF #.ENDIF
# APP3TARGET = tldem # APP3TARGET = tldem

1
extensions/test/ole/cpnt/makefile.mk
View File

@@ -59,7 +59,6 @@ SHL1TARGET= $(TARGET)
SHL1STDLIBS= \ SHL1STDLIBS= \
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) $(CPPUHELPERLIB)

3
extensions/test/sax/makefile.mk
View File

@@ -46,9 +46,8 @@ LIB1OBJFILES= $(OBJFILES)
SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \ SHL1STDLIBS= \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(TOOLSLIB) $(TOOLSLIB)
SHL1LIBS= $(LIB1TARGET) SHL1LIBS= $(LIB1TARGET)
SHL1IMPLIB= i$(TARGET) SHL1IMPLIB= i$(TARGET)

3
extensions/test/stm/makefile.mk
View File

@@ -42,9 +42,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1TARGET= $(SLB)$/$(TARGET).lib
SHL1STDLIBS= \ SHL1STDLIBS= \
$(VOSLIB) \
$(SALLIB) \ $(SALLIB) \
$(TOOLSLIB) $(TOOLSLIB)
LIB1OBJFILES= $(OBJFILES) LIB1OBJFILES= $(OBJFILES)
SHL1LIBS= $(LIB1TARGET) SHL1LIBS= $(LIB1TARGET)

10
extensions/workben/makefile.mk
View File

@@ -83,7 +83,6 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS= \ APP1STDLIBS= \
$(CPPUHELPERLIB)\ $(CPPUHELPERLIB)\
$(CPPULIB) \ $(CPPULIB) \
$(VOSLIB) \
$(SALLIB) $(SALLIB)
.ENDIF # testpgp .ENDIF # testpgp
@@ -98,7 +97,6 @@ OBJFILES= $(OBJ)$/testcomponent.obj
APP2TARGET = testcomponent APP2TARGET = testcomponent
APP2OBJS = $(OBJ)$/testcomponent.obj APP2OBJS = $(OBJ)$/testcomponent.obj
APP2STDLIBS = \ APP2STDLIBS = \
$(VOSLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(SALLIB) $(SALLIB)
@@ -113,8 +111,8 @@ OBJFILES= $(OBJ)$/pythontest.obj
#APP4TARGET= pythontest #APP4TARGET= pythontest
#APP4OBJS= $(OBJ)$/pythontest.obj #APP4OBJS= $(OBJ)$/pythontest.obj
#APP4STDLIBS=$(TOOLSLIB) \ #APP4STDLIBS=$(TOOLSLIB)
# $(VOSLIB) #
.ENDIF # phytontest .ENDIF # phytontest
@@ -127,8 +125,7 @@ OBJFILES= $(OBJ)$/pythonautotest.obj
#APP5TARGET= pythonautotest #APP5TARGET= pythonautotest
#APP5OBJS = $(OBJ)$/pythonautotest.obj #APP5OBJS = $(OBJ)$/pythonautotest.obj
#APP5STDLIBS=$(TOOLSLIB) \ #APP5STDLIBS=$(TOOLSLIB)
# $(VOSLIB)
.ENDIF # phytonautotest .ENDIF # phytonautotest
@@ -162,7 +159,6 @@ OBJFILES= $(OBJ)$/testframecontrol.obj
APP3TARGET= testframecontrol APP3TARGET= testframecontrol
APP3OBJS= $(OBJ)$/testframecontrol.obj APP3OBJS= $(OBJ)$/testframecontrol.obj
APP3STDLIBS=$(TOOLSLIB) \ APP3STDLIBS=$(TOOLSLIB) \
$(VOSLIB) \
$(SVTOOLLIB) \ $(SVTOOLLIB) \
$(VCLLIB) $(VCLLIB)

1
forms/util/makefile.mk
View File

@@ -65,7 +65,6 @@ SHL1STDLIBS= \
$(SVLLIB) \ $(SVLLIB) \
$(TKLIB) \ $(TKLIB) \
$(SFX2LIB) \ $(SFX2LIB) \
$(VOSLIB) \
$(UNOTOOLSLIB) \ $(UNOTOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(DBTOOLSLIB) \ $(DBTOOLSLIB) \

1
lingucomponent/source/spellcheck/macosxspell/makefile.mk
View File

@@ -65,7 +65,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \ SHL1STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(VOSLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(SVLLIB) \ $(SVLLIB) \
$(SALLIB) \ $(SALLIB) \

1
xmlsecurity/workben/makefile.mk
View File

@@ -56,7 +56,6 @@ APP1STDLIBS= $(CPPULIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(SVTOOLLIB) \ $(SVTOOLLIB) \
$(SALLIB) \ $(SALLIB) \
$(VOSLIB) \
$(SOTLIB) \ $(SOTLIB) \
$(VCLLIB) \ $(VCLLIB) \
$(SFXLIB) \ $(SFXLIB) \