From b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 13 Mar 2012 11:54:07 +0100
Subject: add $(gb_STDLIBS) to linked libs

---
 stoc/Library_bootstrap.mk     | 1 +
 stoc/Library_introspection.mk | 1 +
 stoc/Library_invocadapt.mk    | 1 +
 stoc/Library_invocation.mk    | 1 +
 stoc/Library_javaloader.mk    | 1 +
 stoc/Library_javavm.mk        | 9 +--------
 stoc/Library_namingservice.mk | 1 +
 stoc/Library_proxyfac.mk      | 1 +
 stoc/Library_reflection.mk    | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'stoc')

diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index 12a86788ebc0..490139bfa421 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,bootstrap,\
     sal \
     salhelper \
     xmlreader \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap))
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index 5766c017d2ee..1e9c97b42a01 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,introspection,\
     cppuhelper \
     sal \
     salhelper \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection))
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index 2da8cf5f6aec..1c5905071bf7 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,invocadapt,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt))
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 4ac1f2ef1658..92ac438477d2 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,invocation,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation))
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 60f7ae6a39e3..e0f1a1391c3d 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,javaloader,\
     cppuhelper \
     jvmaccess \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader))
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index c28e10de8ea9..2095def49dda 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -48,16 +48,9 @@ $(eval $(call gb_Library_add_linked_libs,javavm,\
     jvmfwk \
     sal \
     salhelper \
+    $(gb_STDLIBS) \
 ))
 
-ifeq ($(GUI),WNT)
-
-$(eval $(call gb_Library_add_linked_libs,javavm,\
-    advapi32 \
-))
-
-endif
-
 $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm))
 
 $(eval $(call gb_Library_add_exception_objects,javavm,\
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index 33181dba6651..eaa4d7080c59 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,namingservice,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice))
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index 156d70c8983d..fe1293beff29 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,proxyfac,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac))
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 1d90ea75675a..c56bf0a88a2b 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,reflection,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection))
-- 
cgit