[Libreoffice-commits] core.git: vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl_blacklist.mk

[Markus Mohrhard]

 vcl/Module_vcl.mk                       |    1 +
 vcl/Package_opengl_blacklist.mk         |   16 ++++++++++++++++
 vcl/opengl/opengl_blacklist_windows.xml |   11 +++++++++++
 vcl/opengl/win/blacklist.xml            |   11 -----------
 4 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 56b1a63e670ed7e8c5cda4c86a23c347ce32a224
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jun 5 02:32:01 2015 +0200

    install blacklist into user profile
    
    Change-Id: I2571fcdde1689f1a168a5c5d6bd20785ce018927
    Reviewed-on: https://gerrit.libreoffice.org/16332
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index aa26183..4595375 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     CustomTarget_afm_hash \
     Library_vcl \
 	Package_opengl \
+	Package_opengl_blacklist \
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
         StaticLibrary_vclmain \
 		$(if $(ENABLE_HEADLESS),, \
diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk
new file mode 100644
index 0000000..b858a56
--- /dev/null
+++ b/vcl/Package_opengl_blacklist.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_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl))
+
+$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
+	opengl_blacklist_windows.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/opengl/win/blacklist.xml b/vcl/opengl/opengl_blacklist_windows.xml
similarity index 100%
rename from vcl/opengl/win/blacklist.xml
rename to vcl/opengl/opengl_blacklist_windows.xml