From 8668e044b27ca70de2e5b47741d5ccb2d4418ac4 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Mon, 23 Nov 2015 22:16:31 +0100 Subject: Add comphelper to libmerged Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb --- solenv/gbuild/LinkTarget.mk | 1 + solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 + 2 files changed, 2 insertions(+) (limited to 'solenv') diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 6af790c80dda..d9a97a1d4859 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -818,6 +818,7 @@ endef # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS gb_BUILD_HELPER_LIBS := basegfx \ + comphelper \ cppu \ cppuhelper \ reg \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 97953eed736a..c9275f4679ee 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \ $(if $(filter $(OS),ANDROID),,basebmp) \ basegfx \ canvastools \ + comphelper \ configmgr \ cppcanvas \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ -- cgit v1.2.3