diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
commit | 5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch) | |
tree | 6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /ucb | |
parent | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff) |
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.
Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/Library_cached1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_srtrs1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucb1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpcmis1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpdav1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpexpand1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpext.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpfile1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpftp1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpgio1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpgvfs1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucphier1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpodma1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucppkg1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucptdoc1.mk | 2 |
15 files changed, 0 insertions, 30 deletions
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index e5f4b858179e..1d9ca407cfc4 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,cached1,\ $(gb_UWINAPI) \ )) -$(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 38a48be65839..587b0745f53b 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ $(gb_UWINAPI) \ )) -$(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 5b04efbc31b7..5dabe48bbd4a 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ $(gb_UWINAPI) \ )) -$(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 6d3a61a37174..a19f10be8853 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ $(gb_UWINAPI) \ )) -$(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 c8053c180c9f..a38a8f103146 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ $(gb_UWINAPI) \ )) -$(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 ade70cf4b568..04a29d601286 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ $(gb_UWINAPI) \ )) -$(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 4a1de1b2460f..3e6c5f599a56 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ $(gb_UWINAPI) \ )) -$(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 532e5802de59..12890b1e70fe 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ $(gb_UWINAPI) \ )) -$(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 aa37b20a71af..c0925d24dcaf 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ $(gb_UWINAPI) \ )) -$(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 e863fc7602fe..27c7dea74ae3 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ ucbhelper \ )) -$(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 42f0dc663741..3165c5f933c3 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ ucbhelper \ )) -$(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 4f4325bc5b20..767fbd15208a 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ $(gb_UWINAPI) \ )) -$(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 d11376325a3a..1c0f950e632a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ $(gb_UWINAPI) \ )) -$(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 40983cf0b43b..c3c3671f082d 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ $(gb_UWINAPI) \ )) -$(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 9138ca2af3eb..532d06828fce 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ $(gb_UWINAPI) \ )) -$(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 \ |