add tl and basegfx to libmerged

Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd

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) \

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

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 \