diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:05:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:07:20 +0300 |
commit | be862ff4f7239497625125067c646bf5adab7741 (patch) | |
tree | 8d5b2ff0e038e20dbe00c32f0429e5b906f84401 /sc | |
parent | 629cc605a45e75d6896b524eada2354c1d4d33a8 (diff) |
Try making it possible to use --disable-avmedia for desktop platforms too
Unfinished work in progress.
Change-Id: I978755d73630b8653b169a53f937c1332799e22e
Diffstat (limited to 'sc')
24 files changed, 1 insertions, 24 deletions
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 297c16eef9f3..a70dc324f26f 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 16158c1461e3..ac335e3a462c 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index e26df98c7de7..1e6d54e520e3 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c111a3904e06..ffa39b650e89 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index b44caeb43d4e..35866e12a326 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -14,7 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index c4aa12e17074..2dcbcf25b123 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 9435535aebe5..56159f947f33 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index c467c2d1abe2..0759d6f00e11 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index ca831732486e..b84ba964e9af 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index eb6c494dd3bf..12532f309a9e 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 92f79829cbcb..1d4e3d167af8 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a7a2f9cd1361..352866a9b73c 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 43f3cb016979..2aca4d931d18 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 0cf0c4a212a1..62dc7fc8fa84 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 60c589cee837..14a961278170 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index b17086563d4e..1a892fa64640 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index e8cc3354b452..d64f3c942aa2 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \ $(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index b5ae3da532f0..6d0e33c89089 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 6345a9c2e157..65fa468a057e 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 9dd130d60483..3ad9d3b9a433 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 53f38faf4036..4b7285c4131f 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 493b3bf33261..138ddd38835c 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetobj, \ $(eval $(call gb_CppunitTest_use_external,sc_tablesheetobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 7a611879aeff..f0ad9125d44d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetsobj, \ $(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index b9353cace19f..f46622de9e71 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ )) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ |