soltools conversion to gbuild

The following tools are considered to be obsolete and are discontinued:
ldump, giparser, testhxx and support.

Change-Id: I70813c046edb30546463cda9eb8a1b96c3e840a3

21 files changed, 194 insertions, 555 deletions

diff --git a/soltools/Executable_adjustvisibility.mk b/soltools/Executable_adjustvisibility.mk
new file mode 100644
index 000000000000..6a8ce614b7dd
--- /dev/null
+++ b/soltools/Executable_adjustvisibility.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,adjustvisibility))
+
+$(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\
+    soltools/adjustvisibility/adjustvisibility \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk
new file mode 100644
index 000000000000..45e18246d6db
--- /dev/null
+++ b/soltools/Executable_checkdll.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,checkdll))
+
+$(eval $(call gb_Executable_add_cobjects,checkdll,\
+    soltools/checkdll/checkdll \
+))
+
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+$(eval $(call gb_Executable_add_libs,checkdll,\
+    -ldl \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk
new file mode 100644
index 000000000000..29fb1f853fa8
--- /dev/null
+++ b/soltools/Executable_cpp.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,cpp))
+
+$(eval $(call gb_Executable_add_cobjects,cpp,\
+    soltools/cpp/_cpp \
+    soltools/cpp/_eval \
+    soltools/cpp/_include \
+    soltools/cpp/_lex \
+    soltools/cpp/_macro \
+    soltools/cpp/_mcrvalid \
+    soltools/cpp/_nlist \
+    soltools/cpp/_tokens \
+    soltools/cpp/_unix \
+))
+
+ifneq ($(or $(filter AIX MACOSX,$(OS)),$(filter NO,$(HAVE_GETOPT))),)
+$(eval $(call gb_Executable_add_cobjects,cpp,\
+    soltools/cpp/_getopt \
+))
+endif
+
+ifeq ($(HAVE_GETOPT),YES)
+$(eval $(call gb_Executable_add_defs,cpp,\
+        -DHAVE_GETOPT \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk
new file mode 100644
index 000000000000..a0fc0369f8e1
--- /dev/null
+++ b/soltools/Executable_javadep.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,javadep))
+
+$(eval $(call gb_Executable_add_cobjects,javadep,\
+    soltools/javadep/javadep \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk
new file mode 100644
index 000000000000..e6e7ac6d5ff6
--- /dev/null
+++ b/soltools/Executable_makedepend.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,makedepend))
+
+$(eval $(call gb_Executable_add_exception_objects,makedepend,\
+    soltools/mkdepend/collectdircontent \
+))
+
+$(eval $(call gb_Executable_add_defs,makedepend,\
+    -DNO_X11 \
+    -DXP_PC \
+    -DHW_THREADS \
+))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_add_defs,makedepend,\
+    -wd4100 \
+    -wd4131 \
+    -wd4706 \
+))
+
+$(eval $(call gb_Executable_use_libraries,makedepend,\
+    msvcprt \
+))
+endif
+
+$(eval $(call gb_Executable_add_cobjects,makedepend,\
+    soltools/mkdepend/cppsetup \
+    soltools/mkdepend/ifparser \
+    soltools/mkdepend/include \
+    soltools/mkdepend/main \
+    soltools/mkdepend/parse \
+    soltools/mkdepend/pr \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Makefile b/soltools/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/soltools/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk
new file mode 100644
index 000000000000..ebd855ad30fc
--- /dev/null
+++ b/soltools/Module_soltools.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,soltools))
+
+ifneq ($(CROSS_COMPILING),YES)
+$(eval $(call gb_Module_add_targets,soltools,\
+    Executable_cpp \
+    Executable_javadep \
+    Executable_makedepend \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,soltools,\
+    Executable_checkdll \
+))
+#
+# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES)
+# ifeq ($(GUI)$(COM),WNTMSC)
+#
+else
+$(eval $(call gb_Module_add_targets,soltools,\
+    Package_inc \
+))
+endif # UNX
+
+ifeq ($(OS)$(COM),SOLARISC52)
+$(eval $(call gb_Module_add_targets,soltools,\
+    Executable_adjustvisibility \
+))
+endif # SOLARISC52
+
+endif # CROSS_COMPILING
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/soltools/Package_inc.mk b/soltools/Package_inc.mk
new file mode 100644
index 000000000000..863945fe63f6
--- /dev/null
+++ b/soltools/Package_inc.mk
@@ -0,0 +1,11 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,soltools_inc,$(SRCDIR)/soltools/winunistd))
+$(eval $(call gb_Package_add_file,soltools_inc,inc/unistd.h,unistd.h))
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
deleted file mode 100644
index 1f8d3aac3fd2..000000000000
--- a/soltools/adjustvisibility/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=adjustvisibility
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-noadjust=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-# This tool is for SunStudio on Solaris only
-.IF "$(OS)$(COM)"=="SOLARISC52"
-
-APP1TARGET	= 	adjustvisibility
-APP1OBJS	=	$(OBJ)$/adjustvisibility.obj
-DEPOBJFILES	=	$(APP1OBJ)
-APP1STDLIBS =   -lelf
-APP1RPATH   =   NONE
-
-#APP1STDLIBS+=-lstlport
-APP1STDLIBS+=-lCstd
-
-.ENDIF "$(OS)$(COM)"=="SOLARISC52"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
deleted file mode 100644
index 5ca0fb262381..000000000000
--- a/soltools/checkdll/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=checkdll
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-
-.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
-LIBSALCPPRT=$(0)
-APP1TARGET	= 	checkdll
-APP1OBJS	=	$(OBJ)$/checkdll.obj
-DEPOBJFILES	=	$(APP1OBJS) 
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \
-	&& "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-STDLIB += -ldl
-.ENDIF
-.IF "$(OS)"=="NETBSD"
-APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
-.ENDIF
-.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
deleted file mode 100644
index 82bc13b84d88..000000000000
--- a/soltools/cpp/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=cpp
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-
-all:
-# nothing
-
-.ENDIF
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/_cpp.obj		\
-    $(OBJ)$/_eval.obj 	\
-    $(OBJ)$/_include.obj \
-    $(OBJ)$/_lex.obj 	\
-    $(OBJ)$/_macro.obj 	\
-    $(OBJ)$/_mcrvalid.obj \
-    $(OBJ)$/_nlist.obj 	\
-    $(OBJ)$/_tokens.obj 	\
-    $(OBJ)$/_unix.obj
-
-# nonstandard cpp options needed for Mac (-isysroot),
-# needs the custom stgetopt defined here :/
-.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES"
-OBJFILES += $(OBJ)$/_getopt.obj
-.ENDIF
-.IF "$(HAVE_GETOPT)" == "YES"
-CDEFS += -DHAVE_GETOPT
-.ENDIF
-
-APP1TARGET	=	$(TARGET)
-APP1STACK	=	1000000
-APP1LIBS	=	$(LB)$/$(TARGET).lib
-APP1DEPN	=   $(LB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
deleted file mode 100644
index 9959782c7369..000000000000
--- a/soltools/giparser/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=soltools_giparser
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-
-all:
-# nothing
-
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=\
-    $(OBJ)$/gen_info.obj	\
-    $(OBJ)$/gi_list.obj	    \
-    $(OBJ)$/gi_parse.obj
-
-SLOFILES=\
-    $(SLO)$/gen_info.obj	\
-    $(SLO)$/gi_list.obj	    \
-    $(SLO)$/gi_parse.obj
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
deleted file mode 100644
index eb5533115d56..000000000000
--- a/soltools/ldump/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=ldump
-TARGET=ldump
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-# ldump only supports windows environment
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-#ldump4 reimplements feature set of ldump2 and ldump3
-APP1TARGET=	ldump4
-.IF "$(GUI)"=="WNT"
-APP1STACK=	16000
-.ENDIF
-APP1OBJS=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-
-.ENDIF #"$(COM)"!="GCC"
-.ENDIF #"$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
deleted file mode 100644
index 7a5fcbcb67ba..000000000000
--- a/soltools/mkdepend/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJNAME=soltools
-TARGET=make_makedepend
-PRJ=..
-TARGETTYPE=CUI
-LIBTARGET=NO
-# noadjust here to have dependencies over there
-noadjust=TRUE
-nodep=true
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE : settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-
-all:
-# nothing
-
-.ENDIF
-
-LIBSALCPPRT=
-UWINAPILIB=
-
-CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
-
-.IF "$(COM)" == "MSC"
-# C4100: unreferenced formal parameter
-# C4131: uses old-style declarator
-# C4242: conversion from 'int' to 'char', possible loss of data
-# C4706: assignment within conditional expression
-CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706
-.ENDIF
-
-OBJFILES=  \
-        $(OBJ)$/cppsetup.obj \
-        $(OBJ)$/ifparser.obj \
-        $(OBJ)$/include.obj \
-        $(OBJ)$/main.obj \
-        $(OBJ)$/parse.obj \
-        $(OBJ)$/pr.obj \
-        $(OBJ)$/collectdircontent.obj \
-        $(NULL)
-
-APP1TARGET=makedepend
-APP1OBJS=$(OBJFILES)
-APP1RPATH=NONE
-
-.IF "$(COM)"=="MSC"
-APP1STDLIBS+=msvcprt.lib
-.ENDIF                        # "$(COM)"=="MSC"
-
-.IF "$(OS)$(COM)"=="SOLARISC52"
-#APP1STDLIBS+=-lstlport
-APP1STDLIBS+=-lCstd
-.ENDIF
-
-
-.INCLUDE : target.mk
-
-
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 9ee36a789905..341c34a21d9c 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,13 +1,3 @@
 so  soltools : solenv NULL
-so	soltools								usr1	-	all	so_usr1 NULL
-so	soltools\inc							get	-	all	so_inc NULL
-so	soltools\ldump							nmake	-	w	so_ldump so_mkdep NULL
-so	soltools\winunistd						nmake	-	n	so_wunistd NULL
-so	soltools\mkdepend						nmake	-	all	so_mkdep so_wunistd.n NULL
-so	soltools\checkdll						nmake	-	u	so_chkdl so_adjvis.u so_mkdep NULL
-so	soltools\cpp							nmake	-	all	so_cpp__ so_mkdep so_adjvis.u NULL
-so	soltools\javadep						nmake	-	all	so_jvdep so_mkdep so_adjvis.u NULL
-so	soltools\support						nmake	-	all	so_supp so_mkdep so_adjvis.u NULL
-so	soltools\giparser						nmake	-	all	so_gip so_supp so_adjvis.u NULL
-so	soltools\adjustvisibility				nmake	-	u	so_adjvis so_mkdep NULL
-so  soltools\testhxx                        nmake   -   all so_testhxx so_mkdep NULL
+so  soltools						usr1 - all so_usr1 NULL
+so  soltools\prj                                        nmake - all ro_prj NULL
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
index 409b94aa069e..e69de29bb2d1 100644
--- a/soltools/prj/d.lst
+++ b/soltools/prj/d.lst
@@ -1,11 +0,0 @@
-..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe
-..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe
-..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend
-..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility
-..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe
-..\%__SRC%\bin\javadep %_DEST%\bin\javadep
-..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll
-..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe
-..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc
-..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h
-..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx*
diff --git a/soltools/prj/dmake b/soltools/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/soltools/prj/dmake
+++ /dev/null
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
deleted file mode 100644
index 3bd39b88c1fc..000000000000
--- a/soltools/support/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=soltools_support
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-
-all:
-# nothing
-
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/simstr.obj
-
-SLOFILES= \
-    $(SLO)$/simstr.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
deleted file mode 100644
index 9348eabcad9d..000000000000
--- a/soltools/testhxx/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-PRJ := ..
-PRJNAME := soltools
-TARGET := testhxx
-LIBTARGET := NO
-ENABLE_EXCEPTIONS := TRUE
-
-CAPTURE_COMMAND = echo
-CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-.INCLUDE: settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-
-all:
-# nothing
-
-.ENDIF
-
-SLOFILES = $(SLO)$/testhxx.obj
-
-.INCLUDE: target.mk
-
-ALLTAR: $(BIN)$/$(TARGET)
-
-$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl
-    $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@
-    chmod +x $@
-
-$(MISC)$/testhxx.output: $(SLO)$/testhxx.obj
-    $(TOUCH) $<
-    $(TOUCH) $@
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
deleted file mode 100644
index 00384bf0a10a..000000000000
--- a/soltools/util/makefile.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-# find 'makedepend' in own output tree
-MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
-
-# find 'adjustvisibility' in own output tree
-ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
-
-.IF "$(OS)"=="SOLARIS"
-# hack due to #i53089#
-.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
-HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
-.ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-HELP_COMPATH:=$(COMPATH)
-.ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-.IF "$(COM)"!="GCC"
-SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
-.ENDIF
-.ENDIF
diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk
deleted file mode 100644
index f9519fd1a464..000000000000
--- a/soltools/winunistd/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=winunistd
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-# provide dummy header for generated sources
-$(INCCOM)$/unistd.h : unistd.h
-    @$(COPY) $< $@
-
-.ENDIF # "$(COM)"!="GCC"
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk