summaryrefslogtreecommitdiff
path: root/mdds
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-29 12:27:17 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-31 21:21:40 +0200
commit22f50fb23f4c89fd2a1a5a59f85950042ef34f21 (patch)
tree2aeb565d67dd44f086842187ca74ee3ce0df8e0f /mdds
parent494197d3f9bf6ca6f4d78bea311174d25eea9dd9 (diff)
mdds: convert to gbuild
Change-Id: I7db5dd20e41297efbabef22f559b5552f3afff0f
Diffstat (limited to 'mdds')
-rw-r--r--mdds/Makefile7
-rw-r--r--mdds/Module_mdds.mk20
-rw-r--r--mdds/UnpackedTarball_mdds.mk23
-rw-r--r--mdds/makefile.mk63
-rw-r--r--mdds/prj/d.lst8
-rw-r--r--mdds/prj/dmake0
6 files changed, 50 insertions, 71 deletions
diff --git a/mdds/Makefile b/mdds/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/mdds/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/mdds/Module_mdds.mk b/mdds/Module_mdds.mk
new file mode 100644
index 000000000000..ac0f8a649d7e
--- /dev/null
+++ b/mdds/Module_mdds.mk
@@ -0,0 +1,20 @@
+# -*- 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,mdds))
+
+ifeq ($(SYSTEM_MDDS),NO)
+
+$(eval $(call gb_Module_add_targets,mdds,\
+ UnpackedTarball_mdds \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
new file mode 100644
index 000000000000..c837a52cde38
--- /dev/null
+++ b/mdds/UnpackedTarball_mdds.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_UnpackedTarball_UnpackedTarball,mdds))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
+ mdds/mdds_0.6.0.patch \
+ mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch \
+ mdds/mdds_0.6.0-unused-parameter.patch \
+ mdds/mdds_0.6.0-unreachable-code.patch \
+ mdds/0001-fix-linking-error-with-boost-1.50.patch \
+ mdds/0001-Workaround-for-gcc-bug.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
deleted file mode 100644
index 154bfa69389d..000000000000
--- a/mdds/makefile.mk
+++ /dev/null
@@ -1,63 +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=mdds
-TARGET=mdds
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=mdds_0.6.0
-TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38
-PATCH_FILES=\
- mdds_0.6.0.patch \
- 0001-help-compiler-select-the-right-overload-of-vector-in.patch \
- mdds_0.6.0-unused-parameter.patch \
- mdds_0.6.0-unreachable-code.patch \
- 0001-fix-linking-error-with-boost-1.50.patch \
- 0001-Workaround-for-gcc-bug.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-# --- post-build ---------------------------------------------------
-
-NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
-
-$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
- -@$(MKDIRHIER) $(INCCOM)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/include$/mdds $(INCCOM)
- @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
-$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
index dc5828bc432e..e69de29bb2d1 100644
--- a/mdds/prj/d.lst
+++ b/mdds/prj/d.lst
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\inc\mdds
-mkdir: %_DEST%\inc\mdds\compat
-mkdir: %_DEST%\inc\mdds\hash_container
-
-..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds
-..\%__SRC%\inc\mdds\compat\* %_DEST%\inc\mdds\compat
-..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container
-
diff --git a/mdds/prj/dmake b/mdds/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/mdds/prj/dmake
+++ /dev/null