diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-18 21:35:50 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-18 22:37:58 -0400 |
| commit | 05dd2fb998de7e66345d39b0d34e03c84fe22470 (patch) | |
| tree | 9ff36cd278b3c0bbabd149196f5493eb0099b468 /sc/Library_scfilt.mk | |
| parent | 02346aa4663055e1adf7c52ede89871a493f4513 (diff) | |
Disable all features that rely on orcus.
Change-Id: I6dcf91491497cd9d3662adaeceb73b4b544a56c9
Diffstat (limited to 'sc/Library_scfilt.mk')
| -rw-r--r-- | sc/Library_scfilt.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 75ee0fee8d43..ddd52a39680d 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -63,12 +63,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_externals,scfilt,\ - orcus \ - orcus-parser \ - zlib \ -)) - $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/dif/difexp \ sc/source/filter/dif/difimp \ @@ -221,16 +215,28 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/oox/worksheetfragment \ sc/source/filter/oox/worksheethelper \ sc/source/filter/oox/worksheetsettings \ - sc/source/filter/orcus/interface \ - sc/source/filter/orcus/orcusfiltersimpl \ - sc/source/filter/orcus/xmlcontext \ sc/source/filter/services \ )) +ifeq ($(ENABLE_ORCUS),TRUE) +$(eval $(call gb_Library_use_externals,scfilt,\ + orcus \ + orcus-parser \ + zlib \ +)) + ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_add_defs,scfilt,\ -DSYSTEM_ZLIB \ )) endif +$(eval $(call gb_Library_add_exception_objects,scfilt,\ + sc/source/filter/orcus/interface \ + sc/source/filter/orcus/orcusfiltersimpl \ + sc/source/filter/orcus/xmlcontext \ +)) + +endif + # vim: set noet sw=4 ts=4: |