diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-19 14:25:14 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-18 15:24:41 +0100 |
| commit | d4555cdb9bea76e602d0acc21febe9f29e664286 (patch) | |
| tree | c85cb3fa1e5fc8f8a3a4f48aac1bf493463cf0ae | |
| parent | d4bfd57db03953b066db72069b9cc40badaeb284 (diff) | |
desktop: simplify $(ENABLE_BREAKPAD) checks
Change-Id: Ibe2da6214b1f6555922313b22e2882a2ddb4b9e7
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 7f96873c7979..a425a87f3d93 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -23,11 +23,12 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ ) \ )) -$(eval $(call gb_Library_use_external,sofficeapp,boost_headers)) - -ifeq ($(ENABLE_BREAKPAD),TRUE) -$(eval $(call gb_Library_use_external,sofficeapp,breakpad)) -endif +$(eval $(call gb_Library_use_externals,sofficeapp, \ + $(if $(ENABLE_BREAKPAD),breakpad) \ + $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \ + boost_headers \ + dbus \ +)) $(eval $(call gb_Library_use_custom_headers,sofficeapp,\ officecfg/registry \ @@ -49,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ comphelper \ cppu \ cppuhelper \ - $(if $(filter TRUE,$(ENABLE_BREAKPAD)), \ + $(if $(ENABLE_BREAKPAD), \ crashreport \ ) \ deploymentmisc \ |