From 5032dc0fc339ba6b200e80a5482cc86e00662a0b 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 --- sc/CppunitTest_sc_annotationshapeobj.mk | 2 -- sc/CppunitTest_sc_cellrangeobj.mk | 2 -- sc/CppunitTest_sc_chart_regression_test.mk | 2 -- sc/CppunitTest_sc_databaserangeobj.mk | 2 -- sc/CppunitTest_sc_datapilotfieldobj.mk | 2 -- sc/CppunitTest_sc_datapilottableobj.mk | 2 -- sc/CppunitTest_sc_editfieldobj_cell.mk | 2 -- sc/CppunitTest_sc_editfieldobj_header.mk | 2 -- sc/CppunitTest_sc_filters_test.mk | 2 -- sc/CppunitTest_sc_macros_test.mk | 2 -- sc/CppunitTest_sc_modelobj.mk | 2 -- sc/CppunitTest_sc_namedrangeobj.mk | 2 -- sc/CppunitTest_sc_namedrangesobj.mk | 2 -- sc/CppunitTest_sc_rangelst_test.mk | 2 -- sc/CppunitTest_sc_subsequent_filters_test.mk | 2 -- sc/CppunitTest_sc_tableautoformatfield.mk | 2 -- sc/CppunitTest_sc_tablesheetobj.mk | 2 -- sc/CppunitTest_sc_tablesheetsobj.mk | 2 -- sc/CppunitTest_sc_ucalc.mk | 2 -- sc/Library_sc.mk | 2 -- sc/Library_scd.mk | 2 -- sc/Library_scfilt.mk | 2 -- sc/Library_scui.mk | 2 -- sc/Library_vbaobj.mk | 2 -- 24 files changed, 48 deletions(-) (limited to 'sc') diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index b6bdef73cddb..9522e2779ea4 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 195dea16e5d0..814e9cbbc1a1 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) - $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 4eeb3645c745..1ca505b5b1d7 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b09b0318b1da..b1fd1bc89872 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f8988749dbb0..d221fe5c4bd2 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 31832f2364ab..77f2b0be4e28 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 1826fb887bd5..3f75acb58ba3 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 009aa66f1fb8..32ac4577c5e8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 09df0f2a96b5..5f4c1aa0cbd3 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 3fc1b7c77df6..c74f49433687 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) - $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index cb8f0a53cf9d..4548f4bc37f4 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) - $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 9d30c411f359..ffca9b399833 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 893abdf5ea9a..49a87b49acf4 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 9bd621db1f74..a97a4b1e258c 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) - $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 2f5dd35a7ae1..613ff558c774 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index e526b1750618..23cab33b98cc 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) - $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 0c9220419fd0..1bf3bd956973 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 2f9cb97fd71d..478dcb090552 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 24cc9b7e50c7..4f761856a68a 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -79,8 +79,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) - $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index ed74a69202b6..9bc420fdbde0 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -86,8 +86,6 @@ $(eval $(call gb_Library_use_libraries,sc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sc)) - $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index b22f0c0eaca1..25e2a6e1badf 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,scd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scd)) - $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8a8e6fe0d183..7a5256e4ec7a 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scfilt)) - $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 807d7fd7591d..0cc40992aa37 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,scui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scui)) - $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 791175d5e08c..6272d2238220 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -61,8 +61,6 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) - $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ -- cgit