[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/Package_opengl.mk vcl/Package_opengl_shader.mk

[Luboš Luňák (via logerrit)]

 vcl/Library_vcl.mk |    7 +++++++
 vcl/Module_vcl.mk  |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5574a8fecc00da871dccbd63527d6878cd7083d6
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Apr 9 14:41:19 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Apr 16 13:41:30 2019 +0200

    Library_vcl has a dependency on vcl opengl packages
    
    Without this, building a unittest does not rebuild those if needed.
    
    Change-Id: If15aa2e1d7869d274c8c5f885278e85e0a341c47
    Reviewed-on: https://gerrit.libreoffice.org/70770
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5b7733f6755f..e400051df526 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -568,6 +568,13 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/opengl/OpenGLContext \
     vcl/source/opengl/OpenGLHelper \
  ))
+
+# runtime dependency
+$(eval $(call gb_Library_use_package,vcl,vcl_opengl_shader))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_package,vcl,vcl_opengl_blacklist))
+endif
+
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
     -lm $(DLOPEN_LIBS) \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 314b54a7d520..78604ab0e9c4 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_Module,vcl))
 
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vcl \
-    Package_opengl \
+    Package_opengl_shader \
     Package_theme_definitions \
     Package_tipoftheday \
     UIConfig_vcl \
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl_shader.mk
similarity index 100%
rename from vcl/Package_opengl.mk
rename to vcl/Package_opengl_shader.mk