gbuildize udm

Change-Id: Id6cf22a19de3ae52ffc1e42a7d4114b1e417f2b3

11 files changed, 61 insertions, 195 deletions

diff --git a/udm/Makefile b/udm/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/udm/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/udm/Module_udm.mk b/udm/Module_udm.mk
new file mode 100644
index 000000000000..e346c8714289
--- /dev/null
+++ b/udm/Module_udm.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_Module_Module,udm))
+
+$(eval $(call gb_Module_add_targets,udm,\
+    Package_inc \
+    StaticLibrary_udm \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/udm/Package_inc.mk b/udm/Package_inc.mk
new file mode 100644
index 000000000000..87e6b65caf73
--- /dev/null
+++ b/udm/Package_inc.mk
@@ -0,0 +1,14 @@
+# -*- 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,udm_inc,$(SRCDIR)/udm/inc))
+
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/html/htmlitem.hxx,udm/html/htmlitem.hxx))
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/xml/xmlitem.hxx,udm/xml/xmlitem.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
new file mode 100644
index 000000000000..6077a474e83b
--- /dev/null
+++ b/udm/StaticLibrary_udm.mk
@@ -0,0 +1,23 @@
+# -*- 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_StaticLibrary_StaticLibrary,udm))
+
+$(eval $(call gb_StaticLibrary_set_include,udm,\
+    -I$(SRCDIR)/udm/inc \
+    -I$(SRCDIR)/udm/source/inc \
+    $$(INCLUDE) \
+))
+
+$(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/udm/prj/build.lst b/udm/prj/build.lst
index 3ede458e69eb..7a1de18c9986 100644
--- a/udm/prj/build.lst
+++ b/udm/prj/build.lst
@@ -1,11 +1,3 @@
 ud	udm	:  cosv NULL
 ud	udm								usr1	-	all	ud_mkout NULL
-ud	udm\prj							get		-	all	ud_prj NULL
-ud	udm\inc							get		-	all	ud_inc NULL
-ud	udm\inc\udm		  				get		-	all	udi_udm NULL
-ud	udm\inc\udm\html  				get		-	all	udiu_html NULL
-ud	udm\inc\udm\xml	  				get		-	all	udiu_xml NULL
-ud	udm\source						get	    -	all	ud_src NULL
-ud	udm\source\html					nmake	-	all	uds_html NULL
-ud	udm\source\xml					nmake	-	all	uds_xml NULL
-ud	udm\util						nmake	-	all ud_util uds_xml uds_html NULL
+ud	udm\prj							nmake		-	all	ud_prj NULL
diff --git a/udm/prj/d.lst b/udm/prj/d.lst
index 5dfe7a130727..e69de29bb2d1 100644
--- a/udm/prj/d.lst
+++ b/udm/prj/d.lst
@@ -1,9 +0,0 @@
-mkdir: %_DEST%\inc\udm
-mkdir: %_DEST%\inc\udm\html
-mkdir: %_DEST%\inc\udm\xml
-
-..\%__SRC%\lib\udm.lib %_DEST%\lib\udm.lib
-..\%__SRC%\lib\libudm.a %_DEST%\lib\libudm.a
-..\inc\udm\html\*.hxx %_DEST%\inc\udm\html\*.hxx
-..\inc\udm\xml\*.hxx %_DEST%\inc\udm\xml\*.hxx
-
diff --git a/udm/prj/dmake b/udm/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/udm/prj/dmake
+++ /dev/null
diff --git a/udm/source/html/makefile.mk b/udm/source/html/makefile.mk
deleted file mode 100644
index 34076b9d91ba..000000000000
--- a/udm/source/html/makefile.mk
+++ /dev/null
@@ -1,47 +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=udm
-TARGET=csi_html
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/htmlitem.obj	
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/udm/source/mkinc/fullcpp.mk b/udm/source/mkinc/fullcpp.mk
deleted file mode 100644
index 1c4d949c8214..000000000000
--- a/udm/source/mkinc/fullcpp.mk
+++ /dev/null
@@ -1,38 +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 .
-#
-
-
-
-# --- Settings -----------------------------------------------------
-# Has to be included AFTER settings.mk !
-
-
-.IF "$(GUI)"=="WNT"
-
-# RTTI
-.IF "$(COM)"=="MSC"
-CFLAGS+= -GR
-.ENDIF
-
-.ENDIF
-
-# Or should we simple check for $(COM)==GCC ?
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="WNTGCC"
-CFLAGSCXX+= -frtti
-.ENDIF
-
diff --git a/udm/source/xml/makefile.mk b/udm/source/xml/makefile.mk
deleted file mode 100644
index 0b7c3b8249d3..000000000000
--- a/udm/source/xml/makefile.mk
+++ /dev/null
@@ -1,47 +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=udm
-TARGET=csi_xml
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/xmlitem.obj
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/udm/util/makefile.mk b/udm/util/makefile.mk
deleted file mode 100644
index 0021a7abd992..000000000000
--- a/udm/util/makefile.mk
+++ /dev/null
@@ -1,45 +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=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