summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-03-20 16:57:22 +0200
committerTor Lillqvist <tml@collabora.com>2015-03-20 17:55:08 +0200
commit41c66312885393614c274897fd75a25c2ddf6ba0 (patch)
tree32b0daca01dc17aba0c03c029890e05eb9c21b47 /solenv
parent9527eeec237f5d797a6420371c76f95246adeb84 (diff)
The 'svp' "plug-in" library is empty so don't build it at all
Its code is in the vcl library nowadays. Change-Id: Idb659e541226724004660102f6641c38a2312c27
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/CppunitTest.mk1
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk3
2 files changed, 0 insertions, 4 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f7c857713cbe..970e8b909474 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -168,7 +168,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstr
ifeq ($(GUIBASE),unx)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector)
$(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
- $(call gb_Library_get_target,vclplug_svp), \
$(call gb_Library_get_target,vclplug_gen) \
$(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
$(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3c73485ccaf5..ea2b600963d1 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -153,9 +153,6 @@ gb_MERGEDLIBS := \
utl \
uui \
vcl \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
- $(if $(ENABLE_HEADLESS),,vclplug_svp) \
- ) \
xmlscript \
xo \
xstor \