From b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 13 Mar 2012 11:54:07 +0100 Subject: add $(gb_STDLIBS) to linked libs --- io/Library_acceptor.mk | 1 + io/Library_connector.mk | 1 + io/Library_streams.mk | 1 + io/Library_textinstream.mk | 1 + io/Library_textoutstream.mk | 1 + 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 + 14 files changed, 14 insertions(+), 8 deletions(-) diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 9c558bbb7257..12639b98baab 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,acceptor,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 1111aa6bd0aa..07ddfb9b705f 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,connector,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 8c9a889c22ed..66d866371040 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,streams,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index 2a2526200b1f..b6d0f82ec9a7 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,textinstream,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 0034208a3792..6de90504ba73 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,textoutstream,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) 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