Finally, gut the vos module out of the build

scp2/source/ooo/file_library_ooo.scp

@@ -1567,17 +1567,6 @@ File gid_File_Lib_Vcl
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-File gid_File_Lib_Vos
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vos3,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 // STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)

scp2/source/ooo/module_hidden_ooo.scp

@@ -330,7 +330,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
 	gid_File_Lib_Unoxml,
-	gid_File_Lib_Vos,
 	gid_File_Lib_Localebe,
 	gid_File_Lib_Migrationoo2,
 	gid_File_Lib_Syssh,

soldep/bootstrp/makefile.mk

@@ -63,8 +63,7 @@ SHL1DEPN	=$(SHL1LIBS)
 SHL1STDLIBS=\
             $(TOOLSLIB) \
             $(BTSTRPLIB)		\
-            $(VOSLIB)			\
-            $(SALLIB)   
+            $(SALLIB)
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt

soldep/source/makefile.mk

@@ -70,7 +70,6 @@ SHL1STDLIBS     = $(SVTOOLLIB)		\
                 $(SOTLIB)			\
                 $(BTSTRPLIB)		\
                 $(TOOLSLIB) 		\
-                $(VOSLIB)			\
                 $(SALLIB)           \
                 $(CPPULIB)  \
                    $(PERL_LIB)
@@ -111,7 +110,6 @@ APP1STDLIBS= \
             $(SOTLIB)			\
             $(BTSTRPLIB)		\
             $(TOOLSLIB) 		\
-            $(VOSLIB)			\
             $(SALLIB)           \
                $(CPPULIB)  \
                $(PERL_LIB)

solenv/inc/libs.mk

@@ -95,7 +95,6 @@ REGLIB=-lreg$(UDK_MAJOR)
 REGLIB=-lreg
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 .INCLUDE .IGNORE : vos/version.mk
-VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
 .IF "$(GUI)$(COM)"=="WNTGCC"
@@ -324,7 +323,7 @@ BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
 # Libraries
 USED_OSL_LIBS =
 USED_VOS_LIBS =		$(OSLLIB)
-USED_UNO_LIBS =		$(VOSLIB) $(OSLLIB)
+USED_UNO_LIBS =		 $(OSLLIB)
 USED_TOOLS_LIBS =
 USED_SOT_LIBS = 	$(TOOLSLIB)
 USED_VCL_LIBS =		$(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS)
@@ -394,7 +393,6 @@ TOOLSLIB=itools.lib
 TOOLSLIBST=atools.lib
 BPICONVLIB=bpiconv.lib
 SALLIB=isal.lib
-VOSLIB=ivos.lib
 UNOTOOLSLIB=iutl.lib
 RMCXTLIB=irmcxt.lib
 XMLOFFLIB=ixo.lib

splitbuild/common.lst

-basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
+basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards