From fe32762e119221d3738056b096a4ef054cdffa52 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 9 Aug 2012 00:15:52 +0200 Subject: tubes: add to libmerged to fix circular dependency Probably it belongs in there anyway. Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8 --- Library_merged.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Library_merged.mk') diff --git a/Library_merged.mk b/Library_merged.mk index 68874e14f802..cc54e95f326c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ jpeg \ libxml2 \ + telepathy \ zlib \ )) @@ -88,8 +89,4 @@ $(eval $(call gb_Library_use_libraries,merged,\ )) endif -ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_Library_use_libraries,merged,tubes)) -endif - # vim: set noet sw=4 ts=4: -- cgit