Finally, gut the vos module out of the build

7 files changed, 3 insertions, 9 deletions

diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
index e67b9e120..06e153038 100644
--- a/binfilter/bf_forms/util/makefile.mk
+++ b/binfilter/bf_forms/util/makefile.mk
@@ -64,7 +64,6 @@ SHL1STDLIBS= \
         $(VCLLIB) \
         $(BFSVTOOLLIB) \
         $(BFSVXLIB) \
-        $(VOSLIB) \
         $(UNOTOOLSLIB) \
         $(COMPHELPERLIB) \
         $(DBTOOLSLIB) \
diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
index 5834daca3..ef96a28b5 100644
--- a/binfilter/bf_sc/util/makefile.mk
+++ b/binfilter/bf_sc/util/makefile.mk
@@ -75,7 +75,6 @@ SHL1STDLIBS+=       \
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
     $(UCBHELPERLIB)	\
-    $(VOSLIB)		\
     $(SALLIB)		\
     $(SALHELPERLIB)		\
     $(TOOLSLIB)		\
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index dba7b036b..6b92173be 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -72,7 +72,6 @@ SHL1STDLIBS=\
         $(UNOTOOLSLIB) \
         $(TOOLSLIB)	\
         $(BFSVTOOLLIB) \
-        $(VOSLIB) \
         $(COMPHELPERLIB) \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
@@ -89,7 +88,7 @@ SHL1STDLIBS+= \
 .ENDIF
 
 .IF "$(GUI)"=="WIN"
-SHL1STDLIBS=$(VOSLIB) \
+SHL1STDLIBS= \
             ole2.lib compobj.lib storage.lib shell.lib \
             ole2disp.lib typelib.lib
 .ENDIF
diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk
index 442bcbe97..c48650937 100644
--- a/binfilter/bf_svtools/util/makefile.mk
+++ b/binfilter/bf_svtools/util/makefile.mk
@@ -91,9 +91,8 @@ SHL1STDLIBS+= \
         $(COMPHELPERLIB)	\
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
-        $(VOSLIB)			\
         $(SALLIB)
-        
+
 .IF "$(OS)"=="MACOSX"
 # static libraries go at end
 SHL1STDLIBS+= $(JPEG3RDLIB)
diff --git a/binfilter/bf_svx/util/makefile.mk b/binfilter/bf_svx/util/makefile.mk
index 582c6cd4f..26bca9ccb 100644
--- a/binfilter/bf_svx/util/makefile.mk
+++ b/binfilter/bf_svx/util/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS= \
             $(UCBHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
-            $(VOSLIB) \
             $(SALLIB) \
             $(SALHELPERLIB) \
             $(ICUUCLIB)\
diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
index d6bff91e1..0a10793e5 100644
--- a/binfilter/bf_xmloff/util/makefile.mk
+++ b/binfilter/bf_xmloff/util/makefile.mk
@@ -73,7 +73,6 @@ SHL1STDLIBS= \
         $(BFSVTOOLLIB)	\
         $(TOOLSLIB)		\
         $(I18NISOLANGLIB) \
-        $(VOSLIB)		\
         $(CPPULIB)		\
         $(CPPUHELPERLIB)\
         $(COMPHELPERLIB)\
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 1650e02dd..57fde11e2 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
+oox	oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL