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

2 files changed, 2 insertions, 38 deletions

diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 6bd335f9e210..3e23c492f32b 100755
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -61,27 +61,9 @@ $(eval $(call gb_Library_add_linked_libs,msforms,\
     tk \
     sb \
     stl \
+    $(gb_STDLIBS) \
 ))
 
-# this code usually will be platform specific; these libraries are also defined in Repository.mk
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,msforms,\
-    dl \
-    m \
-    pthread \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,msforms,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
-endif
-
 # add all source files that shall be compiled with exceptions enabled
 # the name is relative to $(SRCROOT) and must not contain an extension
 $(eval $(call gb_Library_add_exception_objects,msforms,\
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 01d144cc4897..722b66d709a1 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -63,27 +63,9 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\
     svl \
     msfilter \
     tk \
+    $(gb_STDLIBS) \
 ))
 
-# this code usually will be platform specific; these libraries are also defined in Repository.mk
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vbahelper,\
-    dl \
-    m \
-    pthread \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vbahelper,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
-endif
-
 # add all source files that shall be compiled with exceptions enabled
 # the name is relative to $(SRCROOT) and must not contain an extension
 $(eval $(call gb_Library_add_exception_objects,vbahelper,\