diff options
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index c4b14a044729..e523814f6244 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,\ - $(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 \ |