diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-03 21:52:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-03 22:44:32 +0100 |
| commit | 39d445e0eb439e5aea94214f63aa4a04e5829011 (patch) | |
| tree | afb5ba1e84333c39fa0c252ad1140563f22093dd /sc/Library_scfilt.mk | |
| parent | ca08fcbb90defb44456a5973bd1cc76b817d9a4f (diff) | |
sc: clean up Library_scfilt.mk duplication wrt. ORCUS
Change-Id: Ide3c9987fb15112d5a4c8c2b5e15277b2579ee51
Diffstat (limited to 'sc/Library_scfilt.mk')
| -rw-r--r-- | sc/Library_scfilt.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 77c848621446..d19b37903ecb 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -29,13 +29,8 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\ )) $(eval $(call gb_Library_use_externals,scfilt,\ - orcus \ - orcus-parser \ boost_headers \ - boost_system \ - boost_iostreams \ mdds_headers \ - zlib \ )) $(eval $(call gb_Library_use_libraries,scfilt,\ @@ -230,15 +225,11 @@ ifeq ($(ENABLE_ORCUS),TRUE) $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ orcus-parser \ + boost_system \ + boost_iostreams \ zlib \ )) -ifneq ($(SYSTEM_ZLIB),) -$(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 \ |