Port main/cosv and mac/vos to gbuild.

Patch by: me

34 files changed, 417 insertions, 693 deletions

diff --git a/Repository.mk b/Repository.mk
index a8b20661bc26..04fd1b9f8043 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -253,6 +253,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     codemaker \
     commoncpp \
     commonjava \
+    cosv \
     ooopathutils \
     salcpprt \
     sldshw_s \
diff --git a/cosv/Makefile b/cosv/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/cosv/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cosv/source/service/makefile.mk b/cosv/Module_cosv.mk
index d4b1d46e68a2..0ad3e45cc0a2 100644
--- a/cosv/source/service/makefile.mk
+++ b/cosv/Module_cosv.mk
@@ -21,35 +21,12 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_service
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/comdline.obj 	\
-    $(OBJ)$/comfunc.obj 	\
-    $(OBJ)$/csv_ostream.obj \
-    $(OBJ)$/datetime.obj 	\
-    $(OBJ)$/std_outp.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_Module,cosv))
 
+$(eval $(call gb_Module_add_targets,cosv,\
+	StaticLibrary_cosv \
+	Package_inc \
+))
 
 
+# vim: set noet sw=4 ts=4:
diff --git a/cosv/Package_inc.mk b/cosv/Package_inc.mk
new file mode 100644
index 000000000000..4c9f9dabb54d
--- /dev/null
+++ b/cosv/Package_inc.mk
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,cosv_inc,$(SRCDIR)/cosv/inc/cosv))
+
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/file.hxx,file.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/bstream.hxx,bstream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc_dir.hxx,ploc_dir.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/openclose.hxx,openclose.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comfunc.hxx,comfunc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/datetime.hxx,datetime.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/mbstream.hxx,mbstream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_precomp.h,csv_precomp.h))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_ostream.hxx,csv_ostream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/streamstr.hxx,streamstr.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/x.hxx,x.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/stringdata.hxx,stringdata.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/commandline.hxx,commandline.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/str_types.hxx,str_types.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/plocroot.hxx,plocroot.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/persist.hxx,persist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc.hxx,ploc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_env.hxx,csv_env.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/string.hxx,string.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comdline.hxx,comdline.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/dirchain.hxx,dirchain.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/std_outp.hxx,std_outp.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/tpltools.hxx,tpl/tpltools.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/range.hxx,tpl/range.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/dyn.hxx,tpl/dyn.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/funcall.hxx,tpl/funcall.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/swelist.hxx,tpl/swelist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/vvector.hxx,tpl/vvector.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/processor.hxx,tpl/processor.hxx))
diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
new file mode 100644
index 000000000000..d97aa5f01eae
--- /dev/null
+++ b/cosv/StaticLibrary_cosv.mk
@@ -0,0 +1,63 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,cosv,cosv_inc))
+
+#$(eval $(call gb_StaticLibrary_add_api,cosv,\
+#	udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_StaticLibrary_set_include,cosv,\
+	-I$(SRCDIR)/cosv/inc \
+	-I$(SRCDIR)/cosv/source/inc \
+	$$(INCLUDE) \
+))
+
+#$(eval $(call gb_StaticLibrary_add_defs,cosv,\
+#	-DBASEGFX_STATICLIBRARY \
+#))
+
+# copied sources are generated cxx sources
+$(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
+	cosv/source/service/comdline \
+	cosv/source/service/comfunc \
+	cosv/source/service/csv_ostream \
+	cosv/source/service/datetime \
+	cosv/source/service/std_outp \
+	cosv/source/storage/dirchain \
+	cosv/source/storage/file \
+	cosv/source/storage/mbstream \
+	cosv/source/storage/persist \
+	cosv/source/storage/ploc \
+	cosv/source/storage/ploc_dir \
+	cosv/source/storage/plocroot \
+	cosv/source/strings/str_types \
+	cosv/source/strings/streamstr \
+	cosv/source/strings/string \
+	cosv/source/comphelp/badcast \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst
index 0c036f9760d3..f25c3aadc1cc 100644
--- a/cosv/prj/build.lst
+++ b/cosv/prj/build.lst
@@ -1,15 +1,4 @@
 cs	cosv	:  soltools stlport NULL
-cs	cosv								usr1	-	all	cs_mkout NULL
-cs	cosv\prj							get		-	all	cs_prj NULL
-cs	cosv\inc							get		-	all	cs_inc NULL
-cs	cosv\inc\cosv		  				get		-	all	cs_inc_cosv NULL
-cs	cosv\inc\cosv\template				get		-	all	cs_inc_templ NULL
-cs	cosv\source							get		-	all	cs_src NULL
-cs	cosv\source\inc						get		-	all	cs_src_inc NULL
-cs	cosv\source\service					nmake	-	all	cs_serv NULL
-cs	cosv\source\storage					nmake	-	all	cs_store NULL
-cs	cosv\source\strings					nmake	-	all	cs_string NULL
-cs	cosv\source\comphelp				nmake	-	all	cs_badcast NULL
-cs	cosv\util						    nmake	-	all	cs_util cs_serv cs_store cs_string cs_badcast NULL
+cs	cosv\prj							nmake		-	all	cs_prj NULL
 #==============================================================================================
 
diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst
index 229161c173aa..e69de29bb2d1 100644
--- a/cosv/prj/d.lst
+++ b/cosv/prj/d.lst
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\cosv
-mkdir: %_DEST%\inc%_EXT%\cosv\tpl
-
-..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib
-..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a
-..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx
-..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h
-..\inc\cosv\tpl\*.hxx %_DEST%\inc%_EXT%\cosv\tpl\*.hxx
diff --git a/cosv/source/comphelp/makefile.mk b/cosv/prj/makefile.mk
index c950f1314c1d..c62c6a657d16 100644
--- a/cosv/source/comphelp/makefile.mk
+++ b/cosv/prj/makefile.mk
@@ -21,31 +21,24 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_badcast_wnt
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/badcast.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-
-
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/cosv/util/makefile.mk b/cosv/util/makefile.mk
deleted file mode 100644
index b4cc16185c32..000000000000
--- a/cosv/util/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=cosv
-TARGET=cosv
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-LIB1FILES= 	\
-        $(LB)$/cosv_service.lib		\
-        $(LB)$/cosv_storage.lib     	\
-        $(LB)$/cosv_strings.lib		\
-        $(LB)$/cosv_badcast_wnt.lib
-
-
-# --- Targets ------------------------------------------------------
-
-LIB1TARGET= 	$(LB)$/$(TARGET).lib
-LIB1ARCHIV= 	$(LB)$/lib$(TARGET).a
-
-
-.INCLUDE :  target.mk
-
-
diff --git a/cosv/source/storage/makefile.mk b/vos/Library_vos3.mk
index 95b7a76916f8..ef7d0d6c81e9 100644
--- a/cosv/source/storage/makefile.mk
+++ b/vos/Library_vos3.mk
@@ -21,45 +21,53 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_storage
-
-ENABLE_EXCEPTIONS=true
-
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/dirchain.obj 	\
-    $(OBJ)$/file.obj 		\
-    $(OBJ)$/mbstream.obj    \
-    $(OBJ)$/persist.obj	    \
-    $(OBJ)$/ploc.obj 	    \
-    $(OBJ)$/ploc_dir.obj    \
-    $(OBJ)$/plocroot.obj
-
-#SLOFILES= \
-#	$(SLO)$/file.obj 		\
-#	$(SLO)$/csfileim.obj 	\
-#	$(SLO)$/memstorg.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
+$(eval $(call gb_Library_Library,vos3))
+
+$(eval $(call gb_Library_add_package_headers,vos3,vos_inc))
+
+$(eval $(call gb_Library_set_include,vos3,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/vos/inc \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,vos3, \
+#        udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_Library_add_defs,vos3,\
+	-DVOS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vos3,\
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,vos3,\
+	ws2_32 \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,vos3,\
+	vos/source/conditn \
+	vos/source/module \
+	vos/source/mutex \
+	vos/source/object \
+	vos/source/pipe \
+	vos/source/process \
+	vos/source/refernce \
+	vos/source/security \
+	vos/source/signal \
+	vos/source/socket \
+	vos/source/stream \
+	vos/source/thread \
+	vos/source/timer \
+	vos/source/xception \
+))
+
+# vim: set noet sw=4 ts=4:
 
diff --git a/vos/Makefile b/vos/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/vos/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vos/version.mk b/vos/Module_vos.mk
index 5e7359311b96..2cd73e14e80a 100644
--- a/vos/version.mk
+++ b/vos/Module_vos.mk
@@ -21,16 +21,12 @@
 
 
 
-# target
-VOS_TARGET=vos
+$(eval $(call gb_Module_Module,vos))
 
-# the major 
-VOS_MAJOR=3
-# the minor 
-VOS_MINOR=0
-# the micro 
-VOS_MICRO=0
+$(eval $(call gb_Module_add_targets,vos,\
+	Library_vos3 \
+	Package_inc \
+))
 
-# this is a c++ compatible library 
-VOS_CPP=1
 
+# vim: set noet sw=4 ts=4:
diff --git a/vos/Package_inc.mk b/vos/Package_inc.mk
new file mode 100644
index 000000000000..47e33ffafa02
--- /dev/null
+++ b/vos/Package_inc.mk
@@ -0,0 +1,51 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,vos_inc,$(SRCDIR)/vos/inc/vos))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/conditn.hxx,conditn.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/connectn.hxx,connectn.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/diagnose.hxx,diagnose.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/execabl.hxx,execabl.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/istream.hxx,istream.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/macros.hxx,macros.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/module.hxx,module.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/mutex.hxx,mutex.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/object.hxx,object.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/pipe.hxx,pipe.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/process.hxx,process.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/ref.hxx,ref.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/ref.inl,ref.inl))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refernce.hxx,refernce.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refobj.hxx,refobj.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refobj.inl,refobj.inl))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/runnable.hxx,runnable.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/security.hxx,security.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/signal.hxx,signal.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/socket.hxx,socket.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/stream.hxx,stream.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/thread.hxx,thread.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/timer.hxx,timer.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/types.hxx,types.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/vosdllapi.h,vosdllapi.h))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/xception.hxx,xception.hxx))
+
diff --git a/vos/inc/vos/conditn.hxx b/vos/inc/vos/conditn.hxx
index a27829ca1892..f6f602acfbf4 100644
--- a/vos/inc/vos/conditn.hxx
+++ b/vos/inc/vos/conditn.hxx
@@ -30,6 +30,7 @@
 #endif
 #include <osl/time.h>
 #   include <vos/object.hxx>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -93,7 +94,7 @@ public:
     @version 1.0
 
 */
-class OCondition : public OObject, public ICondition
+class VOS_DLLPUBLIC OCondition : public OObject, public ICondition
 {
 
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OCondition, vos));
diff --git a/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx
index c21fd6705735..44d5e96521b9 100644
--- a/vos/inc/vos/module.hxx
+++ b/vos/inc/vos/module.hxx
@@ -28,11 +28,12 @@
 #   include <vos/object.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/module.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
 
-class OModule : public OObject
+class VOS_DLLPUBLIC OModule : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OModule, vos));
 
diff --git a/vos/inc/vos/mutex.hxx b/vos/inc/vos/mutex.hxx
index 5c5ea155c71c..b8d5bde881a1 100644
--- a/vos/inc/vos/mutex.hxx
+++ b/vos/inc/vos/mutex.hxx
@@ -27,6 +27,7 @@
 #   include <vos/types.hxx>
 #   include <vos/object.hxx>
 #   include <osl/mutex.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -65,7 +66,7 @@ protected:
     @version 1.0
 */
 
-class OMutex : public OObject, public IMutex
+class VOS_DLLPUBLIC OMutex : public OObject, public IMutex
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OMutex, vos));
 
diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
index 46f931974ce7..d967182e1419 100644
--- a/vos/inc/vos/object.hxx
+++ b/vos/inc/vos/object.hxx
@@ -27,6 +27,7 @@
 
 #   include <vos/types.hxx>
 #   include <vos/macros.hxx>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -41,7 +42,7 @@ struct OCreateParam;
     common base class for all framework classes. Used for memory-management
     and runtime type-info.
 */
-class OObject
+class VOS_DLLPUBLIC OObject
 {
 public:
 
@@ -107,7 +108,7 @@ struct OCreateParam
 
 /**
 */
-struct OClassInfo
+struct VOS_DLLPUBLIC OClassInfo
 {
     ///
     const sal_Char  *m_pClassName;
diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index 5a32468481e1..748f5b8f4d90 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.hxx
@@ -44,7 +44,7 @@ class OStreamPipe;
 
 /** Represents a pipe.
 */
-class OPipe : public vos::OReference,
+class VOS_DLLPUBLIC OPipe : public vos::OReference,
               public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(vos::OPipe);
@@ -187,7 +187,7 @@ public:
 
 /** A pipe to send or receive a stream of data.
 */
-class OStreamPipe : public vos::OPipe,
+class VOS_DLLPUBLIC OStreamPipe : public vos::OPipe,
                     public vos::IStream
 {
     VOS_DECLARE_CLASSINFO(vos::OStreamPipe);
diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index c03387296dd4..e788be4555d4 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -30,6 +30,7 @@
 #   include <vos/object.hxx>
 #   include <vos/socket.hxx>
 #   include <osl/process.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -38,7 +39,7 @@ class OProcess;
 
 /** helper class to fill a vector of command line arguments
  */
-class OArgumentList
+class VOS_DLLPUBLIC OArgumentList
 {
     sal_uInt32 n_Args;
     rtl_uString** m_aVec;
@@ -61,7 +62,7 @@ public:
 
 /** helper class to fill a vector of environment settings
  */
-class OEnvironment
+class VOS_DLLPUBLIC OEnvironment
 {
     sal_Int32 n_Vars;
     rtl_uString** m_aVec;
@@ -91,7 +92,7 @@ public:
     <li>setting user rights and security,
     <li>providing ioresources like file descriptors and sockets.</ul>
 */
-class OProcess : public OObject
+class VOS_DLLPUBLIC OProcess : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OProcess, vos));
 
@@ -218,7 +219,7 @@ protected:
 */
 
 
-class OStartupInfo : public OObject
+class VOS_DLLPUBLIC OStartupInfo : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStartupInfo, vos));
 
@@ -277,7 +278,7 @@ public:
 
 class OExtCommandLineImpl;
 
-class OExtCommandLine : public OObject
+class VOS_DLLPUBLIC OExtCommandLine : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OExtCommandLine, vos));
     static vos::OExtCommandLineImpl* pExtImpl;
diff --git a/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx
index b093fef5d6ac..62521269838e 100644
--- a/vos/inc/vos/refernce.hxx
+++ b/vos/inc/vos/refernce.hxx
@@ -27,6 +27,7 @@
 #   include <vos/types.hxx>
 #   include <osl/interlck.h>
 #   include <vos/object.hxx>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -48,7 +49,7 @@ public:
     virtual RefCount SAL_CALL referenced() const=0;
 };
 
-class ORefCount
+class VOS_DLLPUBLIC ORefCount
 {
 public:
     typedef IReference::RefCount RefCount;
@@ -78,7 +79,7 @@ private:
     ORefCount& SAL_CALL operator= (const ORefCount&);
 };
 
-class OReference : public vos::IReference
+class VOS_DLLPUBLIC OReference : public vos::IReference
 {
 public:
     OReference();
diff --git a/vos/inc/vos/security.hxx b/vos/inc/vos/security.hxx
index 502714b6a27d..8264b6651158 100644
--- a/vos/inc/vos/security.hxx
+++ b/vos/inc/vos/security.hxx
@@ -27,6 +27,7 @@
 #   include <vos/object.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/security.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -39,7 +40,7 @@ namespace vos
     @version 1.0
 
 */
-class OSecurity : public OObject
+class VOS_DLLPUBLIC OSecurity : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSecurity, vos));
 
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index e3eaceb15f7c..ea491bb77adf 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.hxx
@@ -28,6 +28,7 @@
 #   include <vos/types.hxx>
 #   include <vos/object.hxx>
 #   include <osl/signal.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -42,7 +43,7 @@ SignalHandlerFunction_impl signalHandlerFunction_impl;
     @version 1.0
 */
 
-class OSignalHandler : public vos::OObject
+class VOS_DLLPUBLIC OSignalHandler : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSignalHandler, vos));
 
diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index cb512da5e352..209e92713339 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.hxx
@@ -33,6 +33,7 @@
 #   include <vos/refobj.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/socket.h>
+#   include <vos/vosdllapi.h>
 
 #include <osl/time.h>
 
@@ -198,7 +199,7 @@ public:
     virtual sal_Bool SAL_CALL operator== (oslSocketAddr Addr)= 0;
 };
 
-class OSocketAddr : public vos::ISocketAddr,
+class VOS_DLLPUBLIC OSocketAddr : public vos::ISocketAddr,
             public vos::OObject
 
 {
@@ -270,7 +271,7 @@ protected:
 
 /** Represents an internet-address.
 */
-class OInetSocketAddr : public vos::OSocketAddr
+class VOS_DLLPUBLIC OInetSocketAddr : public vos::OSocketAddr
 {
     VOS_DECLARE_CLASSINFO(vos::OInetSocketAddr);
 public:
@@ -355,7 +356,7 @@ public:
 
 /** Represents an IPX/SPX address.
 */
-class OIpxSocketAddr :  public vos::OSocketAddr
+class VOS_DLLPUBLIC OIpxSocketAddr :  public vos::OSocketAddr
 {
     VOS_DECLARE_CLASSINFO(vos::OIpxSocketAddr);
 public:
@@ -426,7 +427,7 @@ public:
 
 /** Represents a socket.
 */
-class OSocket : public vos::ISocketTypes,
+class VOS_DLLPUBLIC OSocket : public vos::ISocketTypes,
                 public vos::OReference,
                 public vos::OObject
 {
@@ -805,7 +806,7 @@ public:
 
 /** A socket to send or receive a stream of data.
 */
-class OStreamSocket : public vos::OSocket,
+class VOS_DLLPUBLIC OStreamSocket : public vos::OSocket,
                       public vos::IStream
 {
     VOS_DECLARE_CLASSINFO(vos::OStreamSocket);
@@ -948,7 +949,7 @@ protected:
 
 /** A socket to accept incoming connections.
 */
-class OAcceptorSocket : public vos::OSocket
+class VOS_DLLPUBLIC OAcceptorSocket : public vos::OSocket
 {
     VOS_DECLARE_CLASSINFO(vos::OAcceptorSocket);
 public:
@@ -1010,7 +1011,7 @@ public:
 
 /** A socket to initiate a conenction.
 */
-class OConnectorSocket : public vos::OStreamSocket
+class VOS_DLLPUBLIC OConnectorSocket : public vos::OStreamSocket
 {
     VOS_DECLARE_CLASSINFO(vos::OConnectorSocket);
 public:
@@ -1046,7 +1047,7 @@ public:
 
 /** A connectionless socket to send and receive datagrams.
 */
-class ODatagramSocket : public vos::OSocket
+class VOS_DLLPUBLIC ODatagramSocket : public vos::OSocket
 {
     VOS_DECLARE_CLASSINFO(vos::ODatagramSocket);
 public:
diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index af2bcdbf8019..bcd6aede2492 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.hxx
@@ -27,6 +27,7 @@
 #   include <vos/types.hxx>
 #   include <vos/object.hxx>
 #   include <vos/istream.hxx>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -71,7 +72,7 @@ protected:
 
 /** Implements IPositionableStream
 */
-class OStream : public vos::OObject,
+class VOS_DLLPUBLIC OStream : public vos::OObject,
                 public vos::IPositionableStream
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos));
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index ed11f61d9a2a..31207ae685a7 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.hxx
@@ -29,6 +29,7 @@
 #   include <osl/thread.h>
 #   include <osl/conditn.h>
 #   include <vos/runnable.hxx>
+#   include <vos/vosdllapi.h>
 
 #include <osl/time.h>
 
@@ -49,7 +50,7 @@ ThreadWorkerFunction_impl threadWorkerFunction_impl;
     @version 1.0
 */
 
-class OThread : public vos::IRunnable,
+class VOS_DLLPUBLIC OThread : public vos::IRunnable,
                 public vos::OObject
 {
 
@@ -199,7 +200,7 @@ protected:
     friend void threadWorkerFunction_impl(void *);
 };
 
-class OThreadData : public vos::OObject
+class VOS_DLLPUBLIC OThreadData : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
 
diff --git a/vos/inc/vos/timer.hxx b/vos/inc/vos/timer.hxx
index 7fe9d07eb48f..47433835d45e 100644
--- a/vos/inc/vos/timer.hxx
+++ b/vos/inc/vos/timer.hxx
@@ -28,6 +28,7 @@
 #   include <vos/refernce.hxx>
 #   include <vos/mutex.hxx>
 #   include <osl/time.h>
+#   include <vos/vosdllapi.h>
 
 
 namespace vos
@@ -129,7 +130,7 @@ class OTimerManager;
 
 /** <code> class OTimer </code> : Interface for the Timer and handling the event
 */
-class OTimer : virtual public OReference , virtual public OObject
+class VOS_DLLPUBLIC OTimer : virtual public OReference , virtual public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OTimer, vos));
 
diff --git a/vos/inc/vos/vosdllapi.h b/vos/inc/vos/vosdllapi.h
new file mode 100644
index 000000000000..648d57f6d5eb
--- /dev/null
+++ b/vos/inc/vos/vosdllapi.h
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_VOSDLLAPI_H
+#define INCLUDED_VOSDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(VOS_DLLIMPLEMENTATION)
+#define VOS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define VOS_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define VOS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_VOSDLLAPI_H */
+
diff --git a/vos/inc/vos/xception.hxx b/vos/inc/vos/xception.hxx
index 034afbb720c1..4c24fc4ba779 100644
--- a/vos/inc/vos/xception.hxx
+++ b/vos/inc/vos/xception.hxx
@@ -25,6 +25,7 @@
 #define _XCEPTION_HXX_
 
 #include <vos/object.hxx>
+#include <vos/vosdllapi.h>
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4290 )
@@ -56,7 +57,7 @@ namespace vos
  * just a base class for further exceptions
  */
 
-class OException : public OObject
+class VOS_DLLPUBLIC OException : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OException, vos));
 
diff --git a/vos/prj/build.lst b/vos/prj/build.lst
index acc2d2f7b2a3..a8bb3d5bf50c 100644
--- a/vos/prj/build.lst
+++ b/vos/prj/build.lst
@@ -1,6 +1,2 @@
 vo	vos	:	sal solenv NULL
-vo	vos										usr1	-	all	vo_mkout NULL
-vo	vos\inc\vos								get		-	all	vo_inc NULL
-vo	vos\prj									get		-	all	vo_prj NULL
-vo	vos\source								nmake	-	all	vo_sou NULL
-vo	vos\util								nmake	-	all	vo_util vo_sou NULL
+vo	vos\prj									nmake		-	all	vo_prj NULL
diff --git a/vos/prj/d.lst b/vos/prj/d.lst
index 97860c83ab57..e69de29bb2d1 100644
--- a/vos/prj/d.lst
+++ b/vos/prj/d.lst
@@ -1,16 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\vos
-..\version.mk %_DEST%\inc%_EXT%\vos\version.mk
-..\inc\vos\*.h %_DEST%\inc%_EXT%\vos\*.h
-..\inc\vos\*.hxx %_DEST%\inc%_EXT%\vos\*.hxx
-..\inc\vos\*.inl %_DEST%\inc%_EXT%\vos\*.inl
-
-..\%__SRC%\lib\avos.lib %_DEST%\lib%_EXT%\avos.lib
-..\%__SRC%\lib\ivos.lib %_DEST%\lib%_EXT%\ivos.lib
-..\%__SRC%\lib\vos*.lib %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\slb\cppvos.lib %_DEST%\lib%_EXT%\xvos.lib
-
-..\%__SRC%\bin\vos*.dll %_DEST%\bin%_EXT%\vos*.dll
diff --git a/cosv/source/strings/makefile.mk b/vos/prj/makefile.mk
index 019330857be4..c62c6a657d16 100644
--- a/cosv/source/strings/makefile.mk
+++ b/vos/prj/makefile.mk
@@ -21,34 +21,24 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_strings
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/str_types.obj   \
-    $(OBJ)$/streamstr.obj   \
-    $(OBJ)$/string.obj      
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk
deleted file mode 100644
index 75c90a348aac..000000000000
--- a/vos/source/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=vos
-TARGET=cppvos
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=       $(SLO)$/conditn.obj     \
-                $(SLO)$/mutex.obj       \
-                $(SLO)$/object.obj      \
-                $(SLO)$/refernce.obj    \
-                $(SLO)$/socket.obj      \
-                $(SLO)$/thread.obj      \
-                $(SLO)$/stream.obj      \
-                $(SLO)$/module.obj      \
-                $(SLO)$/timer.obj       \
-                $(SLO)$/process.obj     \
-                $(SLO)$/security.obj    \
-                $(SLO)$/signal.obj      \
-                $(SLO)$/pipe.obj        \
-                $(SLO)$/xception.obj
-
-
-.IF "$(UPDATER)"=="YES"
-OBJFILES=       $(OBJ)$/conditn.obj     \
-                $(OBJ)$/mutex.obj       \
-                $(OBJ)$/object.obj      \
-                $(OBJ)$/refernce.obj    \
-                $(OBJ)$/socket.obj      \
-                $(OBJ)$/thread.obj      \
-                $(OBJ)$/stream.obj      \
-                $(OBJ)$/module.obj      \
-                $(OBJ)$/timer.obj       \
-                $(OBJ)$/process.obj     \
-                $(OBJ)$/security.obj    \
-                $(OBJ)$/signal.obj      \
-                $(OBJ)$/pipe.obj        \
-                $(OBJ)$/xception.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/vos/util/libvos1C50.so.mapfile b/vos/util/libvos1C50.so.mapfile
deleted file mode 100644
index 9891ef97b2aa..000000000000
--- a/vos/util/libvos1C50.so.mapfile
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-	global:
-		__1cDvosFOPipe2G6Mrk1_r1_;
-		__1cDvosFOPipe2T6M_v_;
-		__1cDvosFOPipe2t6M_v_;
-		__1cDvosFOPipe2t6Mpkcn0BLTPipeOption__v_;
-		__1cDvosFOPipe2t6Mpkcn0BLTPipeOption_rkn0AJOSecurity__v_;
-		__1cDvosFOPipe2v6kM_pv_;
-		__1cDvosFOPipeEsend6MpkvL_l_;
-		__1cDvosFOPipeFclose6M_v_;
-		__1cDvosFOPipeGaccept6Mrn0ALOStreamPipe__n0BKTPipeError__;
-		__1cDvosFOPipeGcreate6Mpkcn0BLTPipeOption__C_;
-		__1cDvosFOPipeGcreate6Mpkcn0BLTPipeOption_rkn0AJOSecurity__C_;
-		__1cDvosFOPipeHisValid6kM_C_;
-		__1cDvosGIMutex2T5B6M_v_;
-		__1cDvosGIMutexG__vtbl_;
-		__1cDvosGOMutex2T5B6M_v_;
-		__1cDvosGOMutex2T6M_v_;
-		__1cDvosGOMutex2t5B6M_v_;
-		__1cDvosGOMutex2t6M_v_;
-		__1cDvosGOMutexHacquire6M_v_;
-		__1cDvosGOMutexHrelease6M_v_;
-		__1cDvosGOMutexJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosGOMutexMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosGOMutexMtryToAcquire6M_C_;
-		__1cDvosGOMutexOgetGlobalMutex6F_rn0AGIMutex__;
-		__1cDvosGOTimer2T5B6M_v_;
-		__1cDvosGOTimer2t5B6M_v_;
-		__1cDvosGOTimer2t5B6Mrkn0AKTTimeValue_4_v_;
-		__1cDvosGOTimer2t5B6Mrkn0AKTTimeValue__v_;
-		__1cDvosGOTimerEstop6M_v_;
-		__1cDvosGOTimerFstart6M_v_;
-		__1cDvosGOTimerJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosGOTimerJisTicking6kM_C_;
-		__1cDvosGOTimerMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosGOTimerQsetRemainingTime6Mrkn0AKTTimeValue__v_;
-		__1cDvosHIStream2T5B6M_v_;
-		__1cDvosHODaemon2T5B6M_v_;
-		__1cDvosHODaemon2t5B6Mpkcp24Ln0ANIDaemonAccessSTDaemonStartupMode_4_v_;
-		__1cDvosHODaemonHacquire6M_l_;
-		__1cDvosHODaemonHexecute6Mlppc_n0AOIDaemonManagerTTDaemonManagerError__;
-		__1cDvosHODaemonHgetMode6kM_n0ANIDaemonAccessSTDaemonStartupMode__;
-		__1cDvosHODaemonHrelease6M_l_;
-		__1cDvosHODaemonJgetStatus6kM_n0ANIDaemonAccessNTDaemonStatus__;
-		__1cDvosHODaemonJparseArgs6Flppc_n0BSTCommandLineOption__;
-		__1cDvosHODaemonJsetStatus6Mn0ANIDaemonAccessNTDaemonStatus__v_;
-		__1cDvosHODaemonKgetVersion6kM_L_;
-		__1cDvosHODaemonKreferenced6kM_l_;
-		__1cDvosHODaemonLsetListener6Mrkn0AEORef4n0APIDaemonListener____v_;
-		__1cDvosHODaemonMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosHODaemonNgetIdentifier6kM_pkc_;
-		__1cDvosHODaemonNgetManufactor6kM_pkc_;
-		__1cDvosHODaemonOgetDisplayName6kM_pkc_;
-		__1cDvosHODaemonPgetDependencies6kM_pkc_;
-		__1cDvosHODaemonQexecuteAsProcess6MC_n0AOIDaemonManagerTTDaemonManagerError__;
-		__1cDvosHOModule2T6M_v_;
-		__1cDvosHOModule2t6Mpkcl_v_;
-		__1cDvosHOModuleEload6Mpkcl_C_;
-		__1cDvosHOModuleGunload6M_v_;
-		__1cDvosHOModuleJgetSymbol6Mpkc_pv_;
-		__1cDvosHOObject2T5B6M_v_;
-		__1cDvosHOObject2k6Fpv_v_;
-		__1cDvosHOObject2n6FI_pv_;
-		__1cDvosHOObject2n6FIpv_2_;
-		__1cDvosHOObject2t5B6M_v_;
-		__1cDvosHOObjectIisKindOf6kMrkn0AKOClassInfo__C_;
-		__1cDvosHOObjectJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosHOObjectMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosHOSocket2T5B6M_v_;
-		__1cDvosHOSocket2t5B6Mn0AMISocketTypesLTSocketType_n0CLTAddrFamily_n0CJTProtocol__v_;
-		__1cDvosHOSocket2t5B6Mpv_v_;
-		__1cDvosHOSocket2v6kM_pv_;
-		__1cDvosHOSocketEbind6Mrkn0ALOSocketAddr__C_;
-		__1cDvosHOSocketFclose6M_v_;
-		__1cDvosHOSocketHisValid6kM_C_;
-		__1cDvosHOSocketJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosHOSocketLgetPeerAddr6kMrn0ALOSocketAddr__v_;
-		__1cDvosHOSocketLgetPeerHost6kMpcl_n0AMISocketTypesHTResult__;
-		__1cDvosHOSocketLgetPeerPort6kM_l_;
-		__1cDvosHOSocketMgetLocalAddr6kMrn0ALOSocketAddr__v_;
-		__1cDvosHOSocketMgetLocalHost6kMpcl_n0AMISocketTypesHTResult__;
-		__1cDvosHOSocketMgetLocalPort6kM_l_;
-		__1cDvosHOSocketMsetReuseAddr6kMl_l_;
-		__1cDvosHOSocketNsetTcpNoDelay6kMl_l_;
-		__1cDvosHOSocketOsetRecvBufSize6kMl_l_;
-		__1cDvosHOSocketOsetSendBufSize6kMl_l_;
-		__1cDvosHOSocketVenableNonBlockingMode6MC_C_;
-		__1cDvosHOThread2T5B6M_v_;
-		__1cDvosHOThread2t5B6M_v_;
-		__1cDvosHOThreadEjoin6M_v_;
-		__1cDvosHOThreadEkill6M_v_;
-		__1cDvosHOThreadEwait6FrknJTimeValue__v_;
-		__1cDvosHOThreadFsleep6MrknJTimeValue__n0BMTThreadSleep__;
-		__1cDvosHOThreadFyield6F_v_;
-		__1cDvosHOThreadGcreate6M_C_;
-		__1cDvosHOThreadGresume6M_v_;
-		__1cDvosHOThreadHsuspend6M_v_;
-		__1cDvosHOThreadIschedule6M_C_;
-		__1cDvosHOThreadJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosHOThreadJisRunning6M_C_;
-		__1cDvosHOThreadJterminate6M_v_;
-		__1cDvosHOThreadLsetPriority6Mn0BPTThreadPriority__v_;
-		__1cDvosHOThreadMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosHOThreadMonTerminated6M_v_;
-		__1cDvosHOThreadNgetIdentifier6kM_L_;
-		__1cDvosHOThreadPcreateSuspended6M_C_;
-		__1cDvosHOThreadUgetCurrentIdentifier6F_L_;
-		__1cDvosIOChannelNcreateChannel6Frn0AHOObject__n0AEORef4n0B____;
-		__1cDvosIOProcess2T6M_v_;
-		__1cDvosIOProcess2t6Mpkcp2E_v_;
-		__1cDvosIOProcess2t6Mpkcpp2L_v_;
-		__1cDvosIOProcessEjoin6M_n0BNTProcessError__;
-		__1cDvosIOProcessHexecute6Mn0BOTProcessOption__n0BNTProcessError__;
-		__1cDvosIOProcessHexecute6Mn0BOTProcessOption_rkn0AJOSecurity__n0BNTProcessError__;
-		__1cDvosIOProcessHgetInfo6kMn0BMTProcessData_pn0BMTProcessInfo__n0BNTProcessError__;
-		__1cDvosIOProcessJterminate6M_n0BNTProcessError__;
-		__1cDvosIOProcessKgetProcess6FL_p1_;
-		__1cDvosIOProcessMsetDirectory6Mpkc_v_;
-		__1cDvosIOProcessOaddEnvironment6Mpkcp2_v_;
-		__1cDvosIOProcessOgetCurrentInfo6Fn0BMTProcessData_pn0BMTProcessInfo__n0BNTProcessError__;
-		__1cDvosIOProcessRprovideIOResource6Mpvn0BQTDescriptorFlags__v_;
-		__1cDvosIOProfile2T5B6M_v_;
-		__1cDvosIOProfile2T6M_v_;
-		__1cDvosIOProfile2t5B6M_v_;
-		__1cDvosIOProfile2t5B6Mpkcn0BOTProfileOption__v_;
-		__1cDvosIOProfile2t6M_v_;
-		__1cDvosIOProfile2t6Mpkcn0BOTProfileOption__v_;
-		__1cDvosIOProfileEopen6Mpkcn0BOTProfileOption__C_;
-		__1cDvosIOProfileFclose6M_v_;
-		__1cDvosIOProfileIreadBool6Mpkcp2C_C_;
-		__1cDvosIOProfileJreadIdent6Mpkcp2Lp4L_L_;
-		__1cDvosIOProfileJwriteBool6Mpkcp2C_C_;
-		__1cDvosIOProfileKreadString6Mpkcp2pcL4_C_;
-		__1cDvosIOProfileKwriteIdent6Mpkcp2Lp4L_C_;
-		__1cDvosIOProfileLgetSections6MpkcpcL_L_;
-		__1cDvosIOProfileLremoveEntry6Mpkcp2_C_;
-		__1cDvosIOProfileLwriteString6Mpkcp24_C_;
-		__1cDvosIOProfileOgetProfileName6FpcLpkcp3_C_;
-		__1cDvosIOProfileRgetSectionEntries6MpkcpcL_L_;
-		__1cDvosJOAcceptor2T5B6M_v_;
-		__1cDvosJOAcceptor2t5B6Mrn0AVIAcceptHandlerFactory_rn0ALOSocketAddr_n0AMISocketTypesJTProtocol_n0ELTSocketType_C_v_;
-		__1cDvosJOAcceptor2t6Mrn0AVIAcceptHandlerFactory_rn0ALOSocketAddr_n0AMISocketTypesJTProtocol_n0ELTSocketType_C_v_;
-		__1cDvosJOAcceptorDrun6M_v_;
-		__1cDvosJOAcceptorJterminate6M_v_;
-		__1cDvosJOAcceptorRacceptConnections6Ml_C_;
-		__1cDvosJORefCount2T6M_v_;
-		__1cDvosJORefCountG__vtbl_;
-		__1cDvosJOSecurity2T6M_v_;
-		__1cDvosJOSecurity2t6M_v_;
-		__1cDvosJOSecurityJlogonUser6Mpkcp2_C_;
-		__1cDvosJOSecurityKgetHomeDir6kMpcL_C_;
-		__1cDvosJOSecurityLgetUserName6kMpcL_C_;
-		__1cDvosJOSecurityMgetConfigDir6kMpcL_C_;
-		__1cDvosJOSecurityMgetUserIdent6kMpcL_C_;
-		__1cDvosJOSecurityPisAdministrator6kM_C_;
-		__1cDvosKIReference2T5B6M_v_;
-		__1cDvosKIReferenceG__vtbl_;
-		__1cDvosKOClassInfo2t6Mpkclpk1LpFrkn0AMOCreateParam__pn0AHOObject__v_;
-		__1cDvosKOClassInfoNisDerivedFrom6kMrk1_C_;
-		__1cDvosKOCondition2T6M_v_;
-		__1cDvosKOCondition2t6M_v_;
-		__1cDvosKOConditionDset6M_v_;
-		__1cDvosKOConditionEwait6MpknJTimeValue__n0AKIConditionHTResult__;
-		__1cDvosKOConditionFcheck6M_C_;
-		__1cDvosKOConditionFreset6M_v_;
-		__1cDvosKOReference2T5B6M_v_;
-		__1cDvosKOReference2t5B6M_v_;
-		__1cDvosKOReferenceHacquire6M_l_;
-		__1cDvosKOReferenceHrelease6M_l_;
-		__1cDvosKOSemaphore2T6M_v_;
-		__1cDvosKOSemaphore2t6M_v_;
-		__1cDvosKOSemaphoreG__vtbl_;
-		__1cDvosKOSemaphoreGcreate6ML_v_;
-		__1cDvosKOSemaphoreHacquire6M_v_;
-		__1cDvosKOSemaphoreHrelease6M_v_;
-		__1cDvosKOSemaphoreMtryToAcquire6M_C_;
-		__1cDvosLOEventQdDueueNdispatchEvent6Ml_C_;
-		__1cDvosLOEventQdDueueQregisterListener6Mpn0ATIEventQdDueueListener__C_;
-		__1cDvosLOEventQdDueueSderegisterListener6Mpn0ATIEventQdDueueListener__C_;
-		__1cDvosLOSocketAddr2G6Mrk1_r1_;
-		__1cDvosLOSocketAddr2T6M_v_;
-		__1cDvosLOSocketAddr2t6M_v_;
-		__1cDvosLOSocketAddr2t6Mpv_v_;
-		__1cDvosLOSocketAddr2v6kM_pv_;
-		__1cDvosLOSocketAddrLgetHostname6kMpcl_n0AMISocketTypesHTResult__;
-		__1cDvosLOSocketAddrPresolveHostname6Fpkc_pv_;
-		__1cDvosLOSocketAddrQgetLocalHostname6Fpcl_n0AMISocketTypesHTResult__;
-		__1cDvosLOStreamPipe2G6Mpv_r1_;
-		__1cDvosLOStreamPipe2G6Mrkn0AFOPipe__r1_;
-		__1cDvosLOStreamPipe2T6M_v_;
-		__1cDvosLOStreamPipe2t6M_v_;
-		__1cDvosLOStreamPipe2t6Mrk1_v_;
-		__1cDvosLOStreamPipeEread6kMpvL_l_;
-		__1cDvosLOStreamPipeFisEof6kM_C_;
-		__1cDvosLOStreamPipeFwrite6MpkvL_l_;
-		__1cDvosLOThreadData2T6M_v_;
-		__1cDvosLOThreadData2t6M_v_;
-		__1cDvosLOThreadDataHgetData6M_pv_;
-		__1cDvosLOThreadDataHsetData6Mpv_C_;
-		__1cDvosMOStartupInfo2T6M_v_;
-		__1cDvosMOStartupInfo2t6M_v_;
-		__1cDvosMOStartupInfoOgetCommandArgs6MpcL_n0BNTStartupError__;
-		__1cDvosMOStartupInfoOgetEnvironment6MpkcpcL_n0BNTStartupError__;
-		__1cDvosMOStartupInfoQacceptIOResource6Mrn0AHOSocket__C_;
-		__1cDvosMOStartupInfoRgetExecutableFile6MpcL_n0BNTStartupError__;
-		__1cDvosNOStreamSocket2G6Mrk1_r1_;
-		__1cDvosNOStreamSocket2T6M_v_;
-		__1cDvosNOStreamSocket2t6M_v_;
-		__1cDvosNOStreamSocket2t6Mrk1_v_;
-		__1cDvosNOStreamSocketEread6kMpvL_l_;
-		__1cDvosNOStreamSocketErecv6MpvLn0AMISocketTypesOTSocketMsgFlag__l_;
-		__1cDvosNOStreamSocketFclose6M_v_;
-		__1cDvosNOStreamSocketFisEof6kM_C_;
-		__1cDvosNOStreamSocketFwrite6MpkvL_l_;
-		__1cDvosNOStreamSocketIshutdown6Mn0AMISocketTypesQTSocketDirection__C_;
-		__1cDvosNOStreamSocketJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosNVOS_CLASSINIT2t6Mpn0AKOClassInfo__v_;
-		__1cDvosOIAcceptHandler2T5B6M_v_;
-		__1cDvosOIDaemonManagerQgetGlobalManager6F_n0AEORef4n0B____;
-		__1cDvosOOBaseException2T5B6M_v_;
-		__1cDvosOOBaseExceptionG__vtbl_;
-		__1cDvosOOBaseExceptionJclassInfo6F_rkn0AKOClassInfo__;
-		__1cDvosOOBaseExceptionMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosOOChannelBrokerWgetGlobalChannelBroker6F_n0AEORef4n0B____;
-		__1cDvosOOSignalHandler2T5B6M_v_;
-		__1cDvosOOSignalHandler2t5B6M_v_;
-		__1cDvosOOSignalHandlerFraise6Flpv_n0BNTSignalAction__;
-		__1cDvosOOSignalHandlerMgetClassInfo6kM_rkn0AKOClassInfo__;
-		__1cDvosPOAcceptorSocket2T6M_v_;
-		__1cDvosPOAcceptorSocket2t6Mn0AMISocketTypesLTAddrFamily_n0CJTProtocol_n0CLTSocketType__v_;
-		__1cDvosPOAcceptorSocketFclose6M_v_;
-		__1cDvosPOAcceptorSocketGlisten6Ml_C_;
-		__1cDvosPOAcceptorSocketQacceptConnection6Mrn0ANOStreamSocket__n0AMISocketTypesHTResult__;
-		__1cDvosPODaemonProperty2G6Mrk1_r1_;
-		__1cDvosPODaemonProperty2T6M_v_;
-		__1cDvosPODaemonProperty2t6M_v_;
-		__1cDvosPODaemonProperty2t6MpkcC_v_;
-		__1cDvosPODaemonProperty2t6MpkcL_v_;
-		__1cDvosPODaemonProperty2t6MpkcrknDrtlHOString__v_;
-		__1cDvosPODaemonPropertyHgetName6kM_nDrtlHOString__;
-		__1cDvosPODaemonPropertyHgetType6kM_n0BTTDaemonPropertyType__;
-		__1cDvosPODaemonPropertyIgetULong6ML_L_;
-		__1cDvosPODaemonPropertyJgetString6ML_nDrtlHOString__;
-		__1cDvosPODaemonPropertyKgetBoolean6ML_C_;
-		__1cDvosPOInetSocketAddr2G6Mrk1_r1_;
-		__1cDvosPOInetSocketAddr2T6M_v_;
-		__1cDvosPOInetSocketAddr2t6M_v_;
-		__1cDvosPOInetSocketAddr2t6Mpkcl_v_;
-		__1cDvosPOInetSocketAddr2t6Mpv_v_;
-		__1cDvosPOInetSocketAddr2t6Mrkn0ALOSocketAddr__v_;
-		__1cDvosPOInetSocketAddrHgetPort6kM_l_;
-		__1cDvosPOInetSocketAddrHsetAddr6Mpkc_C_;
-		__1cDvosPOInetSocketAddrHsetPort6Ml_C_;
-		__1cDvosPOInetSocketAddrNgetDottedAddr6kMpcl_n0AMISocketTypesHTResult__;
-		__1cDvosQOConnectorSocket2T6M_v_;
-		__1cDvosQOConnectorSocket2t6Mn0AMISocketTypesLTAddrFamily_n0CJTProtocol_n0CLTSocketType__v_;
-		__1cDvosQOConnectorSocketHconnect6Mrkn0ALOSocketAddr_pknJTimeValue__n0AMISocketTypesHTResult__;
-		__1cDvosSORealDynamicLoaderGgetApi6kM_pv_;
-		__1cDvosSORealDynamicLoaderHacquire6M_L_;
-		__1cDvosSORealDynamicLoaderHrelease6M_L_;
-		__1cDvosSORealDynamicLoaderLnewInstance6Fpp1pkcp4C_2_;
-		__1cDvosSORealDynamicLoaderLnewInstance6Fpp1pkcp4ClC_2_;
-		__1cDvosSORealDynamicLoaderQcomputeSolarName6Fpkcpcl_l_;
-		__1cDvosSORealDynamicLoaderRcomputeModuleName6Fpkcpcl_l_;
-		__1cDvosSORealDynamicLoaderScomputeLibraryName6Fpkcpcl_l_;
-		__1cDvosTIEventQdDueueListener2T5B6M_v_;
-		__1cDvosVIAcceptHandlerFactory2T5B6M_v_;
-		__1cDvosW__RTTI__1nDvosGOTimer__;
-		vosEngulfException;
-		vosMatchException;
-		vosSalvageException;
-	local:
-		*;
-};
\ No newline at end of file
diff --git a/vos/util/makefile.mk b/vos/util/makefile.mk
deleted file mode 100644
index 7e68548bf736..000000000000
--- a/vos/util/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-RTLLIB=irtl.lib
-
-PRJ=..
-
-PRJNAME=vos
-TARGET=vos
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  ..$/version.mk
-
-# --- Files --------------------------------------------------------
-
-SHL1TARGET=$(VOS_TARGET)$(VOS_MAJOR)$(COMID)
-SHL1IMPLIB=i$(TARGET)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS=$(WSOCK32LIB) $(SALLIB)
-.ELSE
-SHL1STDLIBS=$(SALLIB)
-.ENDIF
-
-SHL1LIBS=    $(SLB)$/cpp$(TARGET).lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=    \
-    $(SLO)$/object.obj
-.ENDIF
-.ENDIF
-
-SHL1DEPN=
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-DEF1DEPN    =$(MISC)$/$(SHL1TARGET).flt
-DEFLIB1NAME =cppvos
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/$(SHL1TARGET).flt:
-    @echo ------------------------------
-    @echo Making: $@
-    @echo WEP > $@
-    @echo LIBMAIN >> $@
-    @echo LibMain >> $@
-    @echo _alloc >> $@
-    @echo alloc >> $@
-    @echo _CT >> $@
-    @echo _TI2 >> $@
-    @echo _TI1 >> $@
-    @echo exception::exception >> $@
-    @echo @std@ >> $@
-    @echo __>>$@
-