add basebmp and unotest to Library_merged

Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84

Library_merged.mk

@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 ))
 
 $(eval $(call gb_Library_use_libraries,merged,\
-	$(if $(filter unx,$(GUIBASE)),basebmp) \
 	basegfx \
 	comphelper \
 	cppu \
@@ -40,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	salhelper \
 	tl \
 	ucbhelper \
-	unotest \
 	xmlreader \
 	$(gb_UWINAPI) \
 ))
@@ -105,17 +103,6 @@ $(eval $(call gb_Library_use_externals,merged,\
 	fontconfig \
 	freetype \
 ))
-endif
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,merged,\
-	-lm \
-	-ldl \
-	-lpthread \
-))
-endif
-
-ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_libs,merged,\
 	-lX11 \
 	-lXext \
@@ -127,6 +114,14 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
 ))
 endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,merged,\
+	-lm \
+	-ldl \
+	-lpthread \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,merged,\
 	advapi32 \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -30,6 +30,7 @@ ifeq ($(MERGELIBS),TRUE)
 # we link all object files from these libraries into one, merged library
 gb_MERGEDLIBS := \
 	avmedia \
+	$(if $(filter unx,$(GUIBASE)),basebmp) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,calc) \
 	canvastools \
 	chartcore \
@@ -96,6 +97,7 @@ gb_MERGEDLIBS := \
 	$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
 	ucb1 \
 	ucpfile1 \
+	unotest \
 	utl \
 	uui \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \