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 --- ucb/Library_cached1.mk | 3 ++- ucb/Library_srtrs1.mk | 3 ++- ucb/Library_ucb1.mk | 3 ++- ucb/Library_ucpcmis1.mk | 3 ++- ucb/Library_ucpdav1.mk | 3 ++- ucb/Library_ucpexpand1.mk | 3 ++- ucb/Library_ucpext.mk | 3 ++- ucb/Library_ucpfile1.mk | 3 ++- ucb/Library_ucpftp1.mk | 3 ++- ucb/Library_ucpgio1.mk | 3 ++- ucb/Library_ucpgvfs1.mk | 3 ++- ucb/Library_ucphier1.mk | 3 ++- ucb/Library_ucpodma1.mk | 3 ++- ucb/Library_ucppkg1.mk | 3 ++- ucb/Library_ucptdoc1.mk | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) (limited to 'ucb') diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 93ac31c15548..e5f4b858179e 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cached1)) + $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index c349e1cec703..38a48be65839 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) + $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 109cf2a55be6..5b04efbc31b7 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucb1)) + $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index d7fac5b45f89..6d3a61a37174 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ ucbhelper \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) + $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 3f8e2f42cb0e..e0b9801e2672 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index dda77b3e430a..ade70cf4b568 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) + $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index eb436aee0a6c..4a1de1b2460f 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpext)) + $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 4f729b1dec08..532e5802de59 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) + $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 8b197d56b72c..aa37b20a71af 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) + $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index d986f2c3737c..e863fc7602fe 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) + $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 577b65d6eec1..42f0dc663741 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) + $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 9d33231e23fa..4f4325bc5b20 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) + $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index e67f9aa84660..d11376325a3a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) + $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index f1212d0f629a..40983cf0b43b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) + $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 97c18b33505b..9138ca2af3eb 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) + $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ -- cgit