diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-09 00:15:52 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-09 16:16:51 +0200 |
| commit | fe32762e119221d3738056b096a4ef054cdffa52 (patch) | |
| tree | 51065ae3bc48a78a8f125803ab9456f1c94b7105 | |
| parent | 772d15fb8ccdaa46fab0961712177baf915ed70d (diff) | |
tubes: add to libmerged to fix circular dependency
Probably it belongs in there anyway.
Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8
| -rw-r--r-- | Library_merged.mk | 5 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
3 files changed, 4 insertions, 7 deletions
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: diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08b3aa6d6b66..a07bdff0a159 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1166,9 +1166,7 @@ endef else # !ENABLE_TELEPATHY -define gb_LinkTarget__use_telepathy - -endef +gb_LinkTarget__use_telepathy := endif # ENABLE_TELEPATHY 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: |