diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-13 10:08:19 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-13 20:17:42 -0400 |
| commit | e7d4e621055b2eda658cf6a92d24f7119a9dae30 (patch) | |
| tree | 472f5e649eb9191fbe28692cf2d9783ec5dfe753 | |
| parent | 952153274151aa8af53a8b52a5eba0eb7267e8d6 (diff) | |
add tl and basegfx to libmerged
Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
| -rw-r--r-- | Library_merged.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 2c4257afc121..009cfb216ce4 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ - basegfx \ comphelper \ cppu \ cppuhelper \ @@ -39,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ jvmfwk) \ sal \ salhelper \ - tl \ ucbhelper \ xmlreader \ $(gb_UWINAPI) \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 811f2982b63d..98964d764ff5 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -837,7 +837,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ endef define gb_Linktarget__is_build_tool -$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge)),$(true),$(false)) +$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge rsc svidl)),$(true),$(false)) endef define gb_LinkTarget_use_libraries diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 115e2613ca05..3cf052f8a1ce 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -102,6 +102,7 @@ gb_EXTRAMERGEDLIBS := \ # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + basegfx \ canvastools \ configmgr \ cppcanvas \ @@ -134,6 +135,7 @@ gb_MERGEDLIBS := \ svx \ svxcore \ tk \ + tl \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ ucpfile1 \ |