summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-09 00:15:52 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-09 16:16:51 +0200
commitfe32762e119221d3738056b096a4ef054cdffa52 (patch)
tree51065ae3bc48a78a8f125803ab9456f1c94b7105 /solenv
parent772d15fb8ccdaa46fab0961712177baf915ed70d (diff)
tubes: add to libmerged to fix circular dependency
Probably it belongs in there anyway. Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7bbf6992316d..7a0503993aae 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -58,6 +58,8 @@ gb_MERGEDLIBS := \
xmlscript \
xo \
+gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+
endif
# vim: set noet sw=4 ts=4: