diff options
| -rw-r--r-- | sw/Library_msword.mk | 2 | ||||
| -rw-r--r-- | sw/Library_sw.mk | 13 | ||||
| -rw-r--r-- | sw/Library_swd.mk | 2 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 2 | ||||
| -rw-r--r-- | sw/Library_vbaswobj.mk | 2 |
5 files changed, 6 insertions, 15 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ed3f2b036b8b..67f96f5fd20c 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ ucbhelper \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,msword,\ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 1bc351268f09..2781ef76814a 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ vcl \ vos3 \ xo \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sw,\ @@ -727,15 +727,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/ui/wrtsh/wrtundo \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,sw,\ - dl \ - m \ - pthread \ - sb \ -)) -endif - ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,sw,\ @@ -756,10 +747,10 @@ endif $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) - $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/sdi \ $$(INCLUDE) \ )) + # vim: set noet sw=4 ts=4: diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 45795479eab9..4f6de7a8dbc0 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,swd,\ ucbhelper \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,swd,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 3d039601df0a..ac3a8dfe3bca 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\ ucbhelper \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,swui,\ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index c33a8e4df8f1..ff417692f245 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ utl \ vbahelper \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,vbaswobj,\ |