From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: 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 --- shell/Executable_lngconvex.mk | 2 -- shell/Library_cmdmail.mk | 2 -- shell/Library_desktopbe.mk | 2 -- shell/Library_gconfbe.mk | 2 -- shell/Library_kde4be.mk | 2 -- shell/Library_kdebe.mk | 2 -- shell/Library_localebe.mk | 2 -- shell/Library_macbe.mk | 2 -- shell/Library_recentfile.mk | 2 -- shell/Library_syssh.mk | 2 -- shell/Library_syssh_win.mk | 2 -- shell/Library_tdebe.mk | 2 -- shell/Library_wininetbe.mk | 2 -- 13 files changed, 26 deletions(-) (limited to 'shell') diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index b32ba7e89b97..e5ecb8b998bb 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) - $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 58c13032f883..9f2c8ba1eeda 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) - $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 28a0e8760ab0..f52735eeaa64 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) - $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index d2deb022d20d..7ec447b38005 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) - $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c20863655d9f..b7053cb0401d 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) - $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 8637341d6ff0..13dd3530bfce 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) - $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 0cefa0b8908f..11db1106248a 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localebe1)) - $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 6746fc0bffb8..3aab6ea02292 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,macbe1)) - $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c95b2d1ee343..cd27d3f48cd2 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,recentfile,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,recentfile)) - $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index e16e957b7986..5cbdcb2c8533 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,syssh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index d1b5d0db498a..986dca817dd2 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_system_win32_libs,syssh,\ shell32 \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a9472456af73..de6d19810532 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) - $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index c2dbd1341e30..d578aa616b52 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) - $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ -- cgit v1.2.3