From b85c34978356eb01311f197f00f4dd5f808e3664 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- stoc/Library_bootstrap.mk | 3 ++- stoc/Library_introspection.mk | 3 ++- stoc/Library_invocadapt.mk | 3 ++- stoc/Library_invocation.mk | 3 ++- stoc/Library_javaloader.mk | 3 ++- stoc/Library_javavm.mk | 3 ++- stoc/Library_namingservice.mk | 3 ++- stoc/Library_proxyfac.mk | 3 ++- stoc/Library_reflection.mk | 3 ++- stoc/Library_stocservices.mk | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) (limited to 'stoc') diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index e1ef1806ae64..46d72b7633d9 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) + $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 2f2f07d4c926..a1e058c86304 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,introspection,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,introspection)) + $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 38dd68b657f0..7fe31573d480 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) + $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index df8d3c78d468..b2544c77372b 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocation)) + $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0ff05a968df..2303d92c0195 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javaloader)) + $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index d8b5b464f44e..a0fc87853263 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,javavm,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javavm)) + $(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 124bfaa3055c..ed115ed30c42 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,namingservice)) + $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index cf87b477597d..8eb08e55265d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) + $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 644f9f28f1b3..aa5198a84bdd 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reflection)) + $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 8f4ec53dd618..2a8b7b8f31e5 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stocservices)) + $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ -- cgit