CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit linking of individual standard libs from makefiles; fix export problem in framework

5 files changed, 5 insertions, 38 deletions

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index b904dbf16433..18a23bb9bcf5 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     stl \
     tl \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -79,11 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
 endif
 endif
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    dl \
-    pthread \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index e0fd67efb03b..31a823a2a207 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     stl \
     tl \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rscdep,\
@@ -83,10 +83,4 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
 endif
 endif
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    dl \
-    pthread \
-))
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 952bb338aabc..491a2a958514 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_set_cxxflags,so_checksum,\
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     sal \
     tl \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
 
@@ -68,10 +68,4 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
 endif
 endif
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    dl \
-    pthread \
-))
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 64b7d6ef0cd4..c086cc5160a1 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
     stl \
     tl \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
 
@@ -77,10 +77,4 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
 endif
 endif
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    dl \
-    pthread \
-))
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 0cb59eaeac94..8489f21d7d47 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     cppu \
     sal \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 
@@ -140,14 +140,6 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\
 ))
 endif
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tl,\
-    dl \
-    m \
-    pthread \
-))
-endif
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \