This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 8a1069585a Merge main/cosv and main/udm into main/autodoc.
8a1069585a is described below
commit 8a1069585a3edf3284cdfd14d00e69a710125cb7
Author: Damjan Jovanovic <[email protected]>
AuthorDate: Sat Feb 10 17:49:34 2024 +0200
Merge main/cosv and main/udm into main/autodoc.
main/autodoc depends on main/cosv and main/udm.
main/udm depends on main/cosv.
No other module depends on main/cosv or main/udm.
The only deliverable from main/autodoc is the autodoc executable -
there are no libraries, and all headers remain private and undelivered.
We might even be able to use some third-party documentation generator
instead of autodoc, perhaps Doxygen. Whether we should go that way is
debatable,
but there is no point in littering main/ with 2 modules and littering
solver/
with many headers and 2 static libraries just so autodoc can consume them.
Rather make their code internal to autodoc.
Patch by: me
(cherry picked from commit 11c03c6d381fea19f0fea13ae5a371ba50bad241)
---
main/Module_ooo.mk | 2 -
main/Repository.mk | 2 -
main/autodoc/Executable_autodoc.mk | 25 +++++++--
main/{cosv => autodoc}/inc/cosv/bstream.hxx | 0
main/{cosv => autodoc}/inc/cosv/comdline.hxx | 0
main/{cosv => autodoc}/inc/cosv/comfunc.hxx | 0
main/{cosv => autodoc}/inc/cosv/commandline.hxx | 0
main/{cosv => autodoc}/inc/cosv/csv_env.hxx | 0
main/{cosv => autodoc}/inc/cosv/csv_ostream.hxx | 0
main/{cosv => autodoc}/inc/cosv/csv_precomp.h | 0
main/{cosv => autodoc}/inc/cosv/datetime.hxx | 0
main/{cosv => autodoc}/inc/cosv/dirchain.hxx | 0
main/{cosv => autodoc}/inc/cosv/file.hxx | 0
main/{cosv => autodoc}/inc/cosv/mbstream.hxx | 0
main/{cosv => autodoc}/inc/cosv/openclose.hxx | 0
main/{cosv => autodoc}/inc/cosv/persist.hxx | 0
main/{cosv => autodoc}/inc/cosv/ploc.hxx | 0
main/{cosv => autodoc}/inc/cosv/ploc_dir.hxx | 0
main/{cosv => autodoc}/inc/cosv/plocroot.hxx | 0
main/{cosv => autodoc}/inc/cosv/std_outp.hxx | 0
main/{cosv => autodoc}/inc/cosv/str_types.hxx | 0
main/{cosv => autodoc}/inc/cosv/streamstr.hxx | 0
main/{cosv => autodoc}/inc/cosv/string.hxx | 0
main/{cosv => autodoc}/inc/cosv/stringdata.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/dyn.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/funcall.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/processor.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/range.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/swelist.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/tpltools.hxx | 0
main/{cosv => autodoc}/inc/cosv/tpl/vvector.hxx | 0
main/{cosv => autodoc}/inc/cosv/x.hxx | 0
main/{udm => autodoc}/inc/udm/html/htmlitem.hxx | 0
main/{udm => autodoc}/inc/udm/xml/xmlitem.hxx | 0
main/autodoc/prj/build.lst | 2 +-
.../source/cosv}/comphelp/badcast.cxx | 0
.../source => autodoc/source/cosv}/fullcpp.mk | 0
.../source => autodoc/source/cosv}/inc/precomp.h | 0
.../source/cosv}/service/comdline.cxx | 0
.../source/cosv}/service/comfunc.cxx | 0
.../source/cosv}/service/commandline.cxx | 0
.../source/cosv}/service/csv_ostream.cxx | 0
.../source/cosv}/service/datetime.cxx | 0
.../source/cosv}/service/std_outp.cxx | 0
.../source/cosv}/storage/dirchain.cxx | 0
.../source/cosv}/storage/file.cxx | 0
.../source/cosv}/storage/mbstream.cxx | 0
.../source/cosv}/storage/persist.cxx | 0
.../source/cosv}/storage/ploc.cxx | 0
.../source/cosv}/storage/ploc_dir.cxx | 0
.../source/cosv}/storage/plocroot.cxx | 0
.../source/cosv}/strings/str_types.cxx | 0
.../source/cosv}/strings/streamstr.cxx | 0
.../source/cosv}/strings/string.cxx | 0
.../source/cosv}/unittest/file_ut.cxx | 0
.../source/cosv}/unittest/makefile.mk | 0
.../source/cosv}/unittest/string_ut.cxx | 0
.../source => autodoc/source/cosv}/unittest/ut.hxx | 0
.../source/cosv}/unittest/ut_main.cxx | 0
.../source/udm}/html/htmlitem.cxx | 0
.../source => autodoc/source/udm}/inc/precomp.h | 0
.../source/udm}/unittest/makefile.mk | 0
.../source/udm}/unittest/test.cxx | 0
.../source => autodoc/source/udm}/xml/xmlitem.cxx | 0
main/cosv/Makefile | 32 -----------
main/cosv/Module_cosv.mk | 32 -----------
main/cosv/Package_inc.mk | 54 -------------------
main/cosv/StaticLibrary_cosv.mk | 63 ----------------------
main/cosv/prj/build.lst | 4 --
main/cosv/prj/d.lst | 0
main/cosv/prj/makefile.mk | 44 ---------------
main/solenv/inc/libs.mk | 4 --
main/toolkit/src2xml/include.lst | 6 +--
main/udm/Makefile | 32 -----------
main/udm/Module_udm.mk | 31 -----------
main/udm/Package_inc.mk | 27 ----------
main/udm/StaticLibrary_udm.mk | 47 ----------------
main/udm/prj/build.lst | 2 -
main/udm/prj/d.lst | 0
main/udm/prj/makefile.mk | 44 ---------------
main/udm/util/makefile.mk | 50 -----------------
81 files changed, 23 insertions(+), 480 deletions(-)
diff --git a/main/Module_ooo.mk b/main/Module_ooo.mk
index 86058792e9..edffee6470 100644
--- a/main/Module_ooo.mk
+++ b/main/Module_ooo.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
codemaker \
comphelper \
configmgr \
- cosv \
cppcanvas \
cppuhelper \
cpputools \
@@ -106,7 +105,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
ucb \
ucbhelper \
udkapi \
- udm \
unixODBC \
unodevtools \
unotools \
diff --git a/main/Repository.mk b/main/Repository.mk
index 18ce1703ba..f015a42c4e 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -306,13 +306,11 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
codemaker \
commoncpp \
commonjava \
- cosv \
ooopathutils \
salcpprt \
sample \
sldshw_s \
vclmain \
- udm \
ulingu \
))
diff --git a/main/autodoc/Executable_autodoc.mk
b/main/autodoc/Executable_autodoc.mk
index d39b7af212..bb3a41e222 100644
--- a/main/autodoc/Executable_autodoc.mk
+++ b/main/autodoc/Executable_autodoc.mk
@@ -28,9 +28,11 @@ $(eval $(call gb_Executable_set_include,autodoc,\
-I$(SRCDIR)/autodoc/inc/ \
-I$(SRCDIR)/autodoc/source/inc/ \
-I$(SRCDIR)/autodoc/source/ary/inc/ \
+ -I$(SRCDIR)/autodoc/source/cosv/inc/ \
-I$(SRCDIR)/autodoc/source/display/inc/ \
-I$(SRCDIR)/autodoc/source/parser/inc/ \
-I$(SRCDIR)/autodoc/source/parser_i/inc/ \
+ -I$(SRCDIR)/autodoc/source/udm/inc/ \
))
#$(eval $(call gb_Executable_add_defs,autodoc,\
@@ -42,11 +44,6 @@ $(eval $(call gb_Executable_add_linked_libs,autodoc,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Executable_add_linked_static_libs,autodoc,\
- cosv \
- udm \
-))
-
# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>
ifeq ($(OS),MACOSX)
$(eval $(call gb_Executable_add_ldflags,autodoc,\
@@ -139,6 +136,22 @@ $(eval $(call gb_Executable_add_exception_objects,autodoc,\
autodoc/source/ary_i/kernel/ci_atag2 \
autodoc/source/ary_i/kernel/ci_text2 \
autodoc/source/ary_i/kernel/d_token \
+ autodoc/source/cosv/service/comdline \
+ autodoc/source/cosv/service/comfunc \
+ autodoc/source/cosv/service/csv_ostream \
+ autodoc/source/cosv/service/datetime \
+ autodoc/source/cosv/service/std_outp \
+ autodoc/source/cosv/storage/dirchain \
+ autodoc/source/cosv/storage/file \
+ autodoc/source/cosv/storage/mbstream \
+ autodoc/source/cosv/storage/persist \
+ autodoc/source/cosv/storage/ploc \
+ autodoc/source/cosv/storage/ploc_dir \
+ autodoc/source/cosv/storage/plocroot \
+ autodoc/source/cosv/strings/str_types \
+ autodoc/source/cosv/strings/streamstr \
+ autodoc/source/cosv/strings/string \
+ autodoc/source/cosv/comphelp/badcast \
autodoc/source/display/html/aryattrs \
autodoc/source/display/html/cfrstd \
autodoc/source/display/html/chd_udk2 \
@@ -293,6 +306,8 @@ $(eval $(call gb_Executable_add_exception_objects,autodoc,\
autodoc/source/parser_i/tokens/x_parse2 \
autodoc/source/tools/filecoll \
autodoc/source/tools/tkpchars \
+ autodoc/source/udm/html/htmlitem \
+ autodoc/source/udm/xml/xmlitem \
autodoc/source/exes/adc_uni/adc_cl \
autodoc/source/exes/adc_uni/adc_cmd_parse \
autodoc/source/exes/adc_uni/adc_cmds \
diff --git a/main/cosv/inc/cosv/bstream.hxx b/main/autodoc/inc/cosv/bstream.hxx
similarity index 100%
rename from main/cosv/inc/cosv/bstream.hxx
rename to main/autodoc/inc/cosv/bstream.hxx
diff --git a/main/cosv/inc/cosv/comdline.hxx
b/main/autodoc/inc/cosv/comdline.hxx
similarity index 100%
rename from main/cosv/inc/cosv/comdline.hxx
rename to main/autodoc/inc/cosv/comdline.hxx
diff --git a/main/cosv/inc/cosv/comfunc.hxx b/main/autodoc/inc/cosv/comfunc.hxx
similarity index 100%
rename from main/cosv/inc/cosv/comfunc.hxx
rename to main/autodoc/inc/cosv/comfunc.hxx
diff --git a/main/cosv/inc/cosv/commandline.hxx
b/main/autodoc/inc/cosv/commandline.hxx
similarity index 100%
rename from main/cosv/inc/cosv/commandline.hxx
rename to main/autodoc/inc/cosv/commandline.hxx
diff --git a/main/cosv/inc/cosv/csv_env.hxx b/main/autodoc/inc/cosv/csv_env.hxx
similarity index 100%
rename from main/cosv/inc/cosv/csv_env.hxx
rename to main/autodoc/inc/cosv/csv_env.hxx
diff --git a/main/cosv/inc/cosv/csv_ostream.hxx
b/main/autodoc/inc/cosv/csv_ostream.hxx
similarity index 100%
rename from main/cosv/inc/cosv/csv_ostream.hxx
rename to main/autodoc/inc/cosv/csv_ostream.hxx
diff --git a/main/cosv/inc/cosv/csv_precomp.h
b/main/autodoc/inc/cosv/csv_precomp.h
similarity index 100%
rename from main/cosv/inc/cosv/csv_precomp.h
rename to main/autodoc/inc/cosv/csv_precomp.h
diff --git a/main/cosv/inc/cosv/datetime.hxx
b/main/autodoc/inc/cosv/datetime.hxx
similarity index 100%
rename from main/cosv/inc/cosv/datetime.hxx
rename to main/autodoc/inc/cosv/datetime.hxx
diff --git a/main/cosv/inc/cosv/dirchain.hxx
b/main/autodoc/inc/cosv/dirchain.hxx
similarity index 100%
rename from main/cosv/inc/cosv/dirchain.hxx
rename to main/autodoc/inc/cosv/dirchain.hxx
diff --git a/main/cosv/inc/cosv/file.hxx b/main/autodoc/inc/cosv/file.hxx
similarity index 100%
rename from main/cosv/inc/cosv/file.hxx
rename to main/autodoc/inc/cosv/file.hxx
diff --git a/main/cosv/inc/cosv/mbstream.hxx
b/main/autodoc/inc/cosv/mbstream.hxx
similarity index 100%
rename from main/cosv/inc/cosv/mbstream.hxx
rename to main/autodoc/inc/cosv/mbstream.hxx
diff --git a/main/cosv/inc/cosv/openclose.hxx
b/main/autodoc/inc/cosv/openclose.hxx
similarity index 100%
rename from main/cosv/inc/cosv/openclose.hxx
rename to main/autodoc/inc/cosv/openclose.hxx
diff --git a/main/cosv/inc/cosv/persist.hxx b/main/autodoc/inc/cosv/persist.hxx
similarity index 100%
rename from main/cosv/inc/cosv/persist.hxx
rename to main/autodoc/inc/cosv/persist.hxx
diff --git a/main/cosv/inc/cosv/ploc.hxx b/main/autodoc/inc/cosv/ploc.hxx
similarity index 100%
rename from main/cosv/inc/cosv/ploc.hxx
rename to main/autodoc/inc/cosv/ploc.hxx
diff --git a/main/cosv/inc/cosv/ploc_dir.hxx
b/main/autodoc/inc/cosv/ploc_dir.hxx
similarity index 100%
rename from main/cosv/inc/cosv/ploc_dir.hxx
rename to main/autodoc/inc/cosv/ploc_dir.hxx
diff --git a/main/cosv/inc/cosv/plocroot.hxx
b/main/autodoc/inc/cosv/plocroot.hxx
similarity index 100%
rename from main/cosv/inc/cosv/plocroot.hxx
rename to main/autodoc/inc/cosv/plocroot.hxx
diff --git a/main/cosv/inc/cosv/std_outp.hxx
b/main/autodoc/inc/cosv/std_outp.hxx
similarity index 100%
rename from main/cosv/inc/cosv/std_outp.hxx
rename to main/autodoc/inc/cosv/std_outp.hxx
diff --git a/main/cosv/inc/cosv/str_types.hxx
b/main/autodoc/inc/cosv/str_types.hxx
similarity index 100%
rename from main/cosv/inc/cosv/str_types.hxx
rename to main/autodoc/inc/cosv/str_types.hxx
diff --git a/main/cosv/inc/cosv/streamstr.hxx
b/main/autodoc/inc/cosv/streamstr.hxx
similarity index 100%
rename from main/cosv/inc/cosv/streamstr.hxx
rename to main/autodoc/inc/cosv/streamstr.hxx
diff --git a/main/cosv/inc/cosv/string.hxx b/main/autodoc/inc/cosv/string.hxx
similarity index 100%
rename from main/cosv/inc/cosv/string.hxx
rename to main/autodoc/inc/cosv/string.hxx
diff --git a/main/cosv/inc/cosv/stringdata.hxx
b/main/autodoc/inc/cosv/stringdata.hxx
similarity index 100%
rename from main/cosv/inc/cosv/stringdata.hxx
rename to main/autodoc/inc/cosv/stringdata.hxx
diff --git a/main/cosv/inc/cosv/tpl/dyn.hxx b/main/autodoc/inc/cosv/tpl/dyn.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/dyn.hxx
rename to main/autodoc/inc/cosv/tpl/dyn.hxx
diff --git a/main/cosv/inc/cosv/tpl/funcall.hxx
b/main/autodoc/inc/cosv/tpl/funcall.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/funcall.hxx
rename to main/autodoc/inc/cosv/tpl/funcall.hxx
diff --git a/main/cosv/inc/cosv/tpl/processor.hxx
b/main/autodoc/inc/cosv/tpl/processor.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/processor.hxx
rename to main/autodoc/inc/cosv/tpl/processor.hxx
diff --git a/main/cosv/inc/cosv/tpl/range.hxx
b/main/autodoc/inc/cosv/tpl/range.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/range.hxx
rename to main/autodoc/inc/cosv/tpl/range.hxx
diff --git a/main/cosv/inc/cosv/tpl/swelist.hxx
b/main/autodoc/inc/cosv/tpl/swelist.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/swelist.hxx
rename to main/autodoc/inc/cosv/tpl/swelist.hxx
diff --git a/main/cosv/inc/cosv/tpl/tpltools.hxx
b/main/autodoc/inc/cosv/tpl/tpltools.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/tpltools.hxx
rename to main/autodoc/inc/cosv/tpl/tpltools.hxx
diff --git a/main/cosv/inc/cosv/tpl/vvector.hxx
b/main/autodoc/inc/cosv/tpl/vvector.hxx
similarity index 100%
rename from main/cosv/inc/cosv/tpl/vvector.hxx
rename to main/autodoc/inc/cosv/tpl/vvector.hxx
diff --git a/main/cosv/inc/cosv/x.hxx b/main/autodoc/inc/cosv/x.hxx
similarity index 100%
rename from main/cosv/inc/cosv/x.hxx
rename to main/autodoc/inc/cosv/x.hxx
diff --git a/main/udm/inc/udm/html/htmlitem.hxx
b/main/autodoc/inc/udm/html/htmlitem.hxx
similarity index 100%
rename from main/udm/inc/udm/html/htmlitem.hxx
rename to main/autodoc/inc/udm/html/htmlitem.hxx
diff --git a/main/udm/inc/udm/xml/xmlitem.hxx
b/main/autodoc/inc/udm/xml/xmlitem.hxx
similarity index 100%
rename from main/udm/inc/udm/xml/xmlitem.hxx
rename to main/autodoc/inc/udm/xml/xmlitem.hxx
diff --git a/main/autodoc/prj/build.lst b/main/autodoc/prj/build.lst
index d9e4dcd86f..35a91b31e6 100644
--- a/main/autodoc/prj/build.lst
+++ b/main/autodoc/prj/build.lst
@@ -1,2 +1,2 @@
-ar autodoc : cosv udm sal NULL
+ar autodoc : sal soltools stlport NULL
ar autodoc\prj nmake
- all ar_prj NULL
diff --git a/main/cosv/source/comphelp/badcast.cxx
b/main/autodoc/source/cosv/comphelp/badcast.cxx
similarity index 100%
rename from main/cosv/source/comphelp/badcast.cxx
rename to main/autodoc/source/cosv/comphelp/badcast.cxx
diff --git a/main/cosv/source/fullcpp.mk b/main/autodoc/source/cosv/fullcpp.mk
similarity index 100%
rename from main/cosv/source/fullcpp.mk
rename to main/autodoc/source/cosv/fullcpp.mk
diff --git a/main/cosv/source/inc/precomp.h
b/main/autodoc/source/cosv/inc/precomp.h
similarity index 100%
rename from main/cosv/source/inc/precomp.h
rename to main/autodoc/source/cosv/inc/precomp.h
diff --git a/main/cosv/source/service/comdline.cxx
b/main/autodoc/source/cosv/service/comdline.cxx
similarity index 100%
rename from main/cosv/source/service/comdline.cxx
rename to main/autodoc/source/cosv/service/comdline.cxx
diff --git a/main/cosv/source/service/comfunc.cxx
b/main/autodoc/source/cosv/service/comfunc.cxx
similarity index 100%
rename from main/cosv/source/service/comfunc.cxx
rename to main/autodoc/source/cosv/service/comfunc.cxx
diff --git a/main/cosv/source/service/commandline.cxx
b/main/autodoc/source/cosv/service/commandline.cxx
similarity index 100%
rename from main/cosv/source/service/commandline.cxx
rename to main/autodoc/source/cosv/service/commandline.cxx
diff --git a/main/cosv/source/service/csv_ostream.cxx
b/main/autodoc/source/cosv/service/csv_ostream.cxx
similarity index 100%
rename from main/cosv/source/service/csv_ostream.cxx
rename to main/autodoc/source/cosv/service/csv_ostream.cxx
diff --git a/main/cosv/source/service/datetime.cxx
b/main/autodoc/source/cosv/service/datetime.cxx
similarity index 100%
rename from main/cosv/source/service/datetime.cxx
rename to main/autodoc/source/cosv/service/datetime.cxx
diff --git a/main/cosv/source/service/std_outp.cxx
b/main/autodoc/source/cosv/service/std_outp.cxx
similarity index 100%
rename from main/cosv/source/service/std_outp.cxx
rename to main/autodoc/source/cosv/service/std_outp.cxx
diff --git a/main/cosv/source/storage/dirchain.cxx
b/main/autodoc/source/cosv/storage/dirchain.cxx
similarity index 100%
rename from main/cosv/source/storage/dirchain.cxx
rename to main/autodoc/source/cosv/storage/dirchain.cxx
diff --git a/main/cosv/source/storage/file.cxx
b/main/autodoc/source/cosv/storage/file.cxx
similarity index 100%
rename from main/cosv/source/storage/file.cxx
rename to main/autodoc/source/cosv/storage/file.cxx
diff --git a/main/cosv/source/storage/mbstream.cxx
b/main/autodoc/source/cosv/storage/mbstream.cxx
similarity index 100%
rename from main/cosv/source/storage/mbstream.cxx
rename to main/autodoc/source/cosv/storage/mbstream.cxx
diff --git a/main/cosv/source/storage/persist.cxx
b/main/autodoc/source/cosv/storage/persist.cxx
similarity index 100%
rename from main/cosv/source/storage/persist.cxx
rename to main/autodoc/source/cosv/storage/persist.cxx
diff --git a/main/cosv/source/storage/ploc.cxx
b/main/autodoc/source/cosv/storage/ploc.cxx
similarity index 100%
rename from main/cosv/source/storage/ploc.cxx
rename to main/autodoc/source/cosv/storage/ploc.cxx
diff --git a/main/cosv/source/storage/ploc_dir.cxx
b/main/autodoc/source/cosv/storage/ploc_dir.cxx
similarity index 100%
rename from main/cosv/source/storage/ploc_dir.cxx
rename to main/autodoc/source/cosv/storage/ploc_dir.cxx
diff --git a/main/cosv/source/storage/plocroot.cxx
b/main/autodoc/source/cosv/storage/plocroot.cxx
similarity index 100%
rename from main/cosv/source/storage/plocroot.cxx
rename to main/autodoc/source/cosv/storage/plocroot.cxx
diff --git a/main/cosv/source/strings/str_types.cxx
b/main/autodoc/source/cosv/strings/str_types.cxx
similarity index 100%
rename from main/cosv/source/strings/str_types.cxx
rename to main/autodoc/source/cosv/strings/str_types.cxx
diff --git a/main/cosv/source/strings/streamstr.cxx
b/main/autodoc/source/cosv/strings/streamstr.cxx
similarity index 100%
rename from main/cosv/source/strings/streamstr.cxx
rename to main/autodoc/source/cosv/strings/streamstr.cxx
diff --git a/main/cosv/source/strings/string.cxx
b/main/autodoc/source/cosv/strings/string.cxx
similarity index 100%
rename from main/cosv/source/strings/string.cxx
rename to main/autodoc/source/cosv/strings/string.cxx
diff --git a/main/cosv/source/unittest/file_ut.cxx
b/main/autodoc/source/cosv/unittest/file_ut.cxx
similarity index 100%
rename from main/cosv/source/unittest/file_ut.cxx
rename to main/autodoc/source/cosv/unittest/file_ut.cxx
diff --git a/main/cosv/source/unittest/makefile.mk
b/main/autodoc/source/cosv/unittest/makefile.mk
similarity index 100%
rename from main/cosv/source/unittest/makefile.mk
rename to main/autodoc/source/cosv/unittest/makefile.mk
diff --git a/main/cosv/source/unittest/string_ut.cxx
b/main/autodoc/source/cosv/unittest/string_ut.cxx
similarity index 100%
rename from main/cosv/source/unittest/string_ut.cxx
rename to main/autodoc/source/cosv/unittest/string_ut.cxx
diff --git a/main/cosv/source/unittest/ut.hxx
b/main/autodoc/source/cosv/unittest/ut.hxx
similarity index 100%
rename from main/cosv/source/unittest/ut.hxx
rename to main/autodoc/source/cosv/unittest/ut.hxx
diff --git a/main/cosv/source/unittest/ut_main.cxx
b/main/autodoc/source/cosv/unittest/ut_main.cxx
similarity index 100%
rename from main/cosv/source/unittest/ut_main.cxx
rename to main/autodoc/source/cosv/unittest/ut_main.cxx
diff --git a/main/udm/source/html/htmlitem.cxx
b/main/autodoc/source/udm/html/htmlitem.cxx
similarity index 100%
rename from main/udm/source/html/htmlitem.cxx
rename to main/autodoc/source/udm/html/htmlitem.cxx
diff --git a/main/udm/source/inc/precomp.h
b/main/autodoc/source/udm/inc/precomp.h
similarity index 100%
rename from main/udm/source/inc/precomp.h
rename to main/autodoc/source/udm/inc/precomp.h
diff --git a/main/udm/source/unittest/makefile.mk
b/main/autodoc/source/udm/unittest/makefile.mk
similarity index 100%
rename from main/udm/source/unittest/makefile.mk
rename to main/autodoc/source/udm/unittest/makefile.mk
diff --git a/main/udm/source/unittest/test.cxx
b/main/autodoc/source/udm/unittest/test.cxx
similarity index 100%
rename from main/udm/source/unittest/test.cxx
rename to main/autodoc/source/udm/unittest/test.cxx
diff --git a/main/udm/source/xml/xmlitem.cxx
b/main/autodoc/source/udm/xml/xmlitem.cxx
similarity index 100%
rename from main/udm/source/xml/xmlitem.cxx
rename to main/autodoc/source/udm/xml/xmlitem.cxx
diff --git a/main/cosv/Makefile b/main/cosv/Makefile
deleted file mode 100644
index c1d144cbd4..0000000000
--- a/main/cosv/Makefile
+++ /dev/null
@@ -1,32 +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.
-#
-#**************************************************************
-
-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/main/cosv/Module_cosv.mk b/main/cosv/Module_cosv.mk
deleted file mode 100644
index 0ad3e45cc0..0000000000
--- a/main/cosv/Module_cosv.mk
+++ /dev/null
@@ -1,32 +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.
-#
-#**************************************************************
-
-
-
-$(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/main/cosv/Package_inc.mk b/main/cosv/Package_inc.mk
deleted file mode 100644
index 4c9f9dabb5..0000000000
--- a/main/cosv/Package_inc.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.
-#
-#**************************************************************
-
-
-
-$(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/main/cosv/StaticLibrary_cosv.mk b/main/cosv/StaticLibrary_cosv.mk
deleted file mode 100644
index d97aa5f01e..0000000000
--- a/main/cosv/StaticLibrary_cosv.mk
+++ /dev/null
@@ -1,63 +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.
-#
-###############################################################
-
-
-
-$(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/main/cosv/prj/build.lst b/main/cosv/prj/build.lst
deleted file mode 100644
index f25c3aadc1..0000000000
--- a/main/cosv/prj/build.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-cs cosv : soltools stlport NULL
-cs cosv\prj nmake
- all cs_prj NULL
-#==============================================================================================
-
diff --git a/main/cosv/prj/d.lst b/main/cosv/prj/d.lst
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/main/cosv/prj/makefile.mk b/main/cosv/prj/makefile.mk
deleted file mode 100644
index 353f9e0db1..0000000000
--- a/main/cosv/prj/makefile.mk
+++ /dev/null
@@ -1,44 +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=..
-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/main/solenv/inc/libs.mk b/main/solenv/inc/libs.mk
index 9dda10160f..dc448566a8 100644
--- a/main/solenv/inc/libs.mk
+++ b/main/solenv/inc/libs.mk
@@ -318,8 +318,6 @@ APP3RDLIB=-lapp
SAMPLE3RDLIB=-lsample
HNJLIB*=-lhyphen
MYSPELLLIB=-lmyspell
-COSVLIB=-lcosv
-UDMLIB=-ludm
ULINGULIB=-lulingu
.IF "$(SYSTEM_HUNSPELL)" == "YES"
HUNSPELLLIB=$(HUNSPELL_LIBS)
@@ -482,8 +480,6 @@ APP3RDLIB= $(LIBPRE) app.lib
SAMPLE3RDLIB= $(LIBPRE) sample.lib
HNJLIB*=libhnj.lib
MYSPELLLIB= $(LIBPRE) myspell.lib
-COSVLIB= $(LIBPRE) cosv.lib
-UDMLIB= $(LIBPRE) udm.lib
ULINGULIB=$(LIBPRE) libulingu.lib
.IF "$(SYSTEM_HUNSPELL)" == "YES"
HUNSPELLLIB=$(HUNSPELL_LIBS)
diff --git a/main/toolkit/src2xml/include.lst b/main/toolkit/src2xml/include.lst
index 965192ce63..ed00fcd800 100644
--- a/main/toolkit/src2xml/include.lst
+++ b/main/toolkit/src2xml/include.lst
@@ -46,8 +46,6 @@
../../ucb/inc
../../ucb/source/inc
../../ucb/unxlngi6.pro/inc
-../../udm/inc
-../../udm/source/inc
../../vcl/inc
../../vcl/unx/inc
../../vcl/unx/source/inc
@@ -67,8 +65,6 @@
../../transex3/inc
../../transex3/unxlngi6.pro/inc
../../bean/unxlngi6.pro/inc
-../../cosv/inc
-../../cosv/source/inc
../../cppu/inc
../../cppu/unxlngi6.pro/inc
../../idlc/inc
@@ -256,9 +252,11 @@
../../autodoc/inc
../../autodoc/source/ary/inc
../../autodoc/source/inc
+../../autodoc/source/cosv/inc
../../autodoc/source/display/inc
../../autodoc/source/parser_i/inc
../../autodoc/source/parser/inc
+../../autodoc/source/udm/inc
../../avmedia/inc
../../avmedia/source/inc
../../avmedia/unxlngi6.pro/inc
diff --git a/main/udm/Makefile b/main/udm/Makefile
deleted file mode 100644
index c1d144cbd4..0000000000
--- a/main/udm/Makefile
+++ /dev/null
@@ -1,32 +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.
-#
-#**************************************************************
-
-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/main/udm/Module_udm.mk b/main/udm/Module_udm.mk
deleted file mode 100644
index c352236495..0000000000
--- a/main/udm/Module_udm.mk
+++ /dev/null
@@ -1,31 +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.
-#
-#**************************************************************
-
-
-
-$(eval $(call gb_Module_Module,udm))
-
-$(eval $(call gb_Module_add_targets,udm,\
- Package_inc \
- StaticLibrary_udm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/udm/Package_inc.mk b/main/udm/Package_inc.mk
deleted file mode 100644
index e66f107f00..0000000000
--- a/main/udm/Package_inc.mk
+++ /dev/null
@@ -1,27 +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.
-#
-#**************************************************************
-
-
-
-$(eval $(call gb_Package_Package,udm_inc,$(SRCDIR)/udm/inc/udm))
-
-$(eval $(call
gb_Package_add_file,udm_inc,inc/udm/html/htmlitem.hxx,html/htmlitem.hxx))
-$(eval $(call
gb_Package_add_file,udm_inc,inc/udm/xml/xmlitem.hxx,xml/xmlitem.hxx))
diff --git a/main/udm/StaticLibrary_udm.mk b/main/udm/StaticLibrary_udm.mk
deleted file mode 100644
index 0e751d7462..0000000000
--- a/main/udm/StaticLibrary_udm.mk
+++ /dev/null
@@ -1,47 +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.
-#
-#**************************************************************
-
-
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,udm))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_cflags,udm,-GR))
-else ifeq ($(OS),LINUX)
-$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
-else ifeq ($(OS),FREEBSD)
-$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
-else ifeq ($(OS),NETBSD)
-$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
-endif
-
-$(eval $(call gb_StaticLibrary_set_include,udm,\
- $$(INCLUDE) \
- -I$(SRCDIR)/udm/source/inc \
- -I$(SRCDIR)/udm/inc \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,udm,\
- udm/source/html/htmlitem \
- udm/source/xml/xmlitem \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/udm/prj/build.lst b/main/udm/prj/build.lst
deleted file mode 100644
index af7eac1126..0000000000
--- a/main/udm/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-ud udm : cosv NULL
-ud udm\prj nmake
- all ud_prj NULL
diff --git a/main/udm/prj/d.lst b/main/udm/prj/d.lst
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/main/udm/prj/makefile.mk b/main/udm/prj/makefile.mk
deleted file mode 100644
index 353f9e0db1..0000000000
--- a/main/udm/prj/makefile.mk
+++ /dev/null
@@ -1,44 +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=..
-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/main/udm/util/makefile.mk b/main/udm/util/makefile.mk
deleted file mode 100644
index a6166a7645..0000000000
--- a/main/udm/util/makefile.mk
+++ /dev/null
@@ -1,50 +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=udm
-TARGET=udm
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-LIB1FILES= \
- $(LB)$/csi_html.lib \
- $(LB)$/csi_xml.lib
-
-
-# --- Targets ------------------------------------------------------
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-
-
-.INCLUDE : target.mk
