diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 21:58:39 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:11 -0400 |
| commit | 470c5fefa5ea60183f3c8056da27dbde1e2c0078 (patch) | |
| tree | 434aa3bd56d7c70ec20bc0bacc91d3bc4e1b503d /Library_merged.mk | |
| parent | 1081150d3575b2da393862214b71dbf30cc489a3 (diff) | |
add basebmp and unotest to Library_merged
Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84
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 \ |