diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-03 22:07:01 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-03 22:09:20 +0200 |
| commit | 8165fc23014c8044c131cb6e1fd0c5e06fd0da2d (patch) | |
| tree | 0c68fe733b1bcd1ac72f46019e1dcebff7af0e7d /solenv | |
| parent | f332db6864c1c0f28feb64a7f79b9b4ef3c76b58 (diff) | |
Fix mergelibs build by adding dbtools to libmerged
Because svxcore links against dbtools since
86bdb13704d9d85a247339071a86d301ce86cd7f
Change-Id: Ibbdd76fc77c3739756d011ae0c1fd99bab57834b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 99f93021b546..859ea8a0da73 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -113,6 +113,7 @@ gb_MERGEDLIBS := \ canvastools \ configmgr \ cppcanvas \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ deployment \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ |