Finally, gut the vos module out of the build

17 files changed, 14 insertions, 37 deletions

diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index 74c6d4d43656..be1fcbf5c8c2 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES=		$(SLO)$/multiplexer.obj				\
 #		$(ONELIB)	 \
 #		$(USRLIB)	 \
 #		$(UNOLIB)	 \
-#		$(VOSLIB) 	 \
 #		$(OSLLIB) 	 \
 #		$(TOOLSLIB) 	 \
 #		$(RTLLIB)
diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk
index fee12e3e6649..064f4284fd36 100644
--- a/automation/source/mozillaserver/makefile.mk
+++ b/automation/source/mozillaserver/makefile.mk
@@ -109,7 +109,7 @@ UNOTYPES= \
 
 #SHL1TARGET=iserverproxy
 #SHL1STDLIBS= \
-#		$(VOSLIB) $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
+#		 $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
 #		$(CPPULIB)		\
 #		$(CPPUHELPERLIB)	\
 #		$(UNOLIB)	\
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 756a3d6a62e4..8747ff4c4b0e 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -55,7 +55,6 @@ SHL1STDLIBS= \
             $(SVLLIB)       \
             $(VCLLIB) \
             $(BASICLIB) \
-            $(VOSLIB) \
             $(SALLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
@@ -86,7 +85,6 @@ SHL2IMPLIB= isimplecm
 
 SHL2STDLIBS= \
             $(TOOLSLIB) \
-            $(VOSLIB) \
             $(SALLIB)
 
 
@@ -109,9 +107,7 @@ SHL3STDLIBS= \
             $(TOOLSLIB) \
             $(SVLLIB)       \
             $(VCLLIB) \
-            $(VOSLIB) \
             $(SALLIB) \
-            $(VOSLIB) \
             $(SIMPLECMLIB)
 
 
@@ -153,7 +149,6 @@ APP1STDLIBS+= \
             $(SVLLIB) \
             $(VCLLIB) \
             $(SALLIB) \
-            $(VOSLIB) \
             $(UCBHELPERLIB) \
             $(COMPHELPERLIB) \
             $(BASICLIB) \
@@ -162,7 +157,7 @@ APP1STDLIBS+= \
 
 .IF "$(GUI)"=="UNX"
 APP1STDLIBS+= \
-            $(VOSLIB) $(SALLIB) $(BASICLIB)
+             $(SALLIB) $(BASICLIB)
 APP1STDLIBS+=$(CPPULIB)
 .ENDIF
 .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
@@ -221,10 +216,10 @@ APP3STDLIBS= \
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
 APP3STDLIBS+= \
-            $(VOSLIB) $(SALLIB) $(LIBSTLPORT)
+             $(SALLIB) $(LIBSTLPORT)
 .ELSE
 APP3STDLIBS+= \
-            $(VOSLIB) $(SALLIB)
+             $(SALLIB)
 .ENDIF
 .ENDIF
 # $(AUTOMATIONLIB) is build in SHL1TARGET
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
index a5a2fc28da87..5059b9b7f94a 100644
--- a/cui/util/makefile.mk
+++ b/cui/util/makefile.mk
@@ -75,7 +75,6 @@ SHL1STDLIBS= \
             $(UCBHELPERLIB) \
             $(CPPUHELPERLIB)        \
             $(CPPULIB) \
-            $(VOSLIB) \
             $(SALLIB) \
             $(JVMFWKLIB) \
             $(ICUUCLIB)
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index ad4ecee72c82..e20e83e0f1e7 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -71,7 +71,6 @@ OWNGUIDCDEFS+= -DOWNGUID
 SHL1TARGET=$(TARGET)
 SHL1STDLIBS=\
         $(SALLIB) 	\
-    $(VOSLIB)	\
     $(CPPULIB)	\
     $(CPPUHELPERLIB)	\
     $(OLE32LIB) 	\
@@ -99,7 +98,6 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp
 SHL2TARGET=$(TARGET2)
 SHL2STDLIBS=\
         $(SALLIB) 	\
-    $(VOSLIB)	\
     $(CPPULIB)	\
     $(CPPUHELPERLIB)	\
     $(OLE32LIB) 	\
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
index e29418a526f2..c0d3a2eed949 100644
--- a/extensions/source/plugin/aqua/makefile.mk
+++ b/extensions/source/plugin/aqua/makefile.mk
@@ -62,7 +62,6 @@ SLOFILES=\
 #APP1OBJS=$(OBJFILES)
 #APP1STDLIBS=\
 #	$(TOOLSLIB) 				\
-#	$(VOSLIB)					\
 #	$(SALLIB)
 
 #APP1DEF=	$(MISC)$/$(TARGET).def
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index b88acc97f21f..f3b7b480e6b9 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -69,9 +69,8 @@ OBJFILES=\
 
 APP1TARGET=pluginapp.bin
 APP1OBJS=$(OBJFILES)
-APP1STDLIBS=\
-    $(VOSLIB)					\
-    $(SALLIB)
+APP1STDLIBS= $(SALLIB)
+
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
 APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
 .ELSE
@@ -98,7 +97,7 @@ DIRECT :=-z nodefs $(DIRECT)
 .ENDIF
 .ENDIF          # "$(PKGCONFIG_ROOT)"!=""
 .ENDIF
-    
+
 
 APP1DEF=	$(MISC)$/$(TARGET).def
 
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 60655f123dc2..75baea867c21 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -87,7 +87,6 @@ SHL1STDLIBS+= \
     $(SVLLIB)			\
         $(UNOTOOLSLIB)                     \
     $(TOOLSLIB)			\
-    $(VOSLIB)			\
     $(UCBHELPERLIB)		\
     $(CPPUHELPERLIB)	\
     $(CPPULIB)			\
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index ff42864e0496..26ed6e70e6a9 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -70,7 +70,6 @@ SHL1STDLIBS=\
     $(CPPULIB)			\
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
-    $(VOSLIB)			\
     $(SALLIB)			\
     $(ONELIB)			\
     $(TOOLSLIB)			\
diff --git a/extensions/source/update/tools/makefile.mk b/extensions/source/update/tools/makefile.mk
index c8c41532662e..d6baac98680a 100644
--- a/extensions/source/update/tools/makefile.mk
+++ b/extensions/source/update/tools/makefile.mk
@@ -52,9 +52,9 @@ APP1STDLIBS = $(TOOLSLIB)
 #APP2TARGET = urltest
 #APP2OBJS = $(OBJ)$/urltest.obj
 #.IF "$(GUI)" == "UNX"
-#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
+#APP2STDLIBS = $(TOOLSLIB)  $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
 #.ELSE
-#APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib
+#APP2STDLIBS = $(LB)$/itools.lib isal.lib icppu.lib icppuhelper.lib
 #.ENDIF
 
 # APP3TARGET = tldem
diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk
index 5668d8453d24..53d3cc321c49 100644
--- a/extensions/test/ole/cpnt/makefile.mk
+++ b/extensions/test/ole/cpnt/makefile.mk
@@ -59,7 +59,6 @@ SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
         $(SALLIB)	\
-        $(VOSLIB)	\
         $(CPPULIB) 	\
         $(CPPUHELPERLIB)
 
diff --git a/extensions/test/sax/makefile.mk b/extensions/test/sax/makefile.mk
index 4e72ec987893..62e2706dd1e7 100644
--- a/extensions/test/sax/makefile.mk
+++ b/extensions/test/sax/makefile.mk
@@ -46,9 +46,8 @@ LIB1OBJFILES=	$(OBJFILES)
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
-        $(VOSLIB) 	 \
         $(SALLIB) 	 \
-        $(TOOLSLIB)	
+        $(TOOLSLIB)
 
 SHL1LIBS=		$(LIB1TARGET)
 SHL1IMPLIB=		i$(TARGET)
diff --git a/extensions/test/stm/makefile.mk b/extensions/test/stm/makefile.mk
index aa506fcb34af..ac31f76fb805 100644
--- a/extensions/test/stm/makefile.mk
+++ b/extensions/test/stm/makefile.mk
@@ -42,9 +42,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 LIB1TARGET= $(SLB)$/$(TARGET).lib	
 
 SHL1STDLIBS= \
-        $(VOSLIB) 	 \
         $(SALLIB) 	 \
-        $(TOOLSLIB)	
+        $(TOOLSLIB)
 
 LIB1OBJFILES=	$(OBJFILES)
 SHL1LIBS=		$(LIB1TARGET)
diff --git a/extensions/workben/makefile.mk b/extensions/workben/makefile.mk
index 759ee81186b2..ca25cfa51312 100644
--- a/extensions/workben/makefile.mk
+++ b/extensions/workben/makefile.mk
@@ -83,7 +83,6 @@ APP1OBJS=	$(OBJFILES)
 APP1STDLIBS= \
             $(CPPUHELPERLIB)\
             $(CPPULIB)		\
-            $(VOSLIB)		\
             $(SALLIB)
 
 .ENDIF # testpgp
@@ -98,7 +97,6 @@ OBJFILES=	$(OBJ)$/testcomponent.obj
 APP2TARGET = testcomponent
 APP2OBJS   = $(OBJ)$/testcomponent.obj
 APP2STDLIBS = \
-              $(VOSLIB) \
               $(TOOLSLIB)	\
               $(SALLIB)
 
@@ -113,8 +111,8 @@ OBJFILES=	$(OBJ)$/pythontest.obj
 
 #APP4TARGET=	pythontest
 #APP4OBJS=	$(OBJ)$/pythontest.obj 
-#APP4STDLIBS=$(TOOLSLIB)		\
-#			$(VOSLIB)
+#APP4STDLIBS=$(TOOLSLIB)
+#
 
 .ENDIF # phytontest
 
@@ -127,8 +125,7 @@ OBJFILES=	$(OBJ)$/pythonautotest.obj
 
 #APP5TARGET= pythonautotest
 #APP5OBJS = $(OBJ)$/pythonautotest.obj
-#APP5STDLIBS=$(TOOLSLIB)		\
-#			$(VOSLIB)
+#APP5STDLIBS=$(TOOLSLIB)
 
 .ENDIF # phytonautotest
 
@@ -162,7 +159,6 @@ OBJFILES=	$(OBJ)$/testframecontrol.obj
 APP3TARGET=	testframecontrol
 APP3OBJS=	$(OBJ)$/testframecontrol.obj
 APP3STDLIBS=$(TOOLSLIB)		\
-            $(VOSLIB)		\
             $(SVTOOLLIB)	\
             $(VCLLIB)
 
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 00d7a81d5a97..79869f0fe8ed 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -65,7 +65,6 @@ SHL1STDLIBS= \
         $(SVLLIB)	\
         $(TKLIB) \
         $(SFX2LIB) \
-        $(VOSLIB) \
         $(UNOTOOLSLIB) \
         $(COMPHELPERLIB) \
         $(DBTOOLSLIB) \
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index 6414560e0f4a..8bad659303ed 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -65,7 +65,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1STDLIBS= \
         $(CPPULIB) 	 \
         $(CPPUHELPERLIB) 	 \
-        $(VOSLIB)		\
         $(TOOLSLIB)		\
         $(SVLLIB)		\
         $(SALLIB)		\
diff --git a/xmlsecurity/workben/makefile.mk b/xmlsecurity/workben/makefile.mk
index 2430a36431c8..e538f09352a2 100644
--- a/xmlsecurity/workben/makefile.mk
+++ b/xmlsecurity/workben/makefile.mk
@@ -56,7 +56,6 @@ APP1STDLIBS=	$(CPPULIB)			\
                 $(TOOLSLIB) 		\
                 $(SVTOOLLIB) 		\
                 $(SALLIB)			\
-                $(VOSLIB)			\
                 $(SOTLIB)			\
                 $(VCLLIB)			\
                 $(SFXLIB)			\