gbuildize x11_extensions

Change-Id: I4362106ac5d221241eafdf44705ca5553ac7013c

6 files changed, 81 insertions, 6 deletions

diff --git a/Makefile.top b/Makefile.top
index 70bfe7a50ddf..bee84e25bf60 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -141,6 +141,7 @@ vcl\
 wizards\
 writerfilter\
 writerperfect\
+x11_extensions\
 xmerge\
 xml2cmp\
 xmlhelp\
@@ -238,7 +239,6 @@ testtools\
 tomcat\
 udm\
 vigra\
-x11_extensions\
 xpdf\
 xsltml\
 zlib\
diff --git a/x11_extensions/Makefile b/x11_extensions/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/x11_extensions/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/x11_extensions/Module_x11_extensions.mk b/x11_extensions/Module_x11_extensions.mk
new file mode 100644
index 000000000000..eadf1a794acb
--- /dev/null
+++ b/x11_extensions/Module_x11_extensions.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,x11_extensions))
+
+$(eval $(call gb_Module_add_targets,x11_extensions,\
+	Package_inc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/x11_extensions/Package_inc.mk b/x11_extensions/Package_inc.mk
new file mode 100644
index 000000000000..8845d1694023
--- /dev/null
+++ b/x11_extensions/Package_inc.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,x11_extensions_inc,$(SRCDIR)/x11_extensions/inc))
+
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randr.h,randr.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randrproto.h,randrproto.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/render.h,render.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/renderproto.h,renderproto.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shapeconst.h,shapeconst.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shape.h,shape.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrandr.h,Xrandr.h))
+$(eval $(call gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrender.h,Xrender.h))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst
index d3c8c6a5918b..e69de29bb2d1 100644
--- a/x11_extensions/prj/d.lst
+++ b/x11_extensions/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\X11
-mkdir: %_DEST%\inc\X11\extensions
-
-..\inc\*.h %_DEST%\inc\X11\extensions\*.h
-
diff --git a/x11_extensions/prj/dmake b/x11_extensions/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11_extensions/prj/dmake
+++ /dev/null