diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 14:45:33 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 14:45:33 +0200 |
| commit | 68ef83dbd75b7f25466e007140aedb9ed3694e50 (patch) | |
| tree | 733a32c244371eef74cb522aa279a5108e4dec22 /oox/Library_oox.mk | |
| parent | b788274180d19329ac0d0f13ac24d23e50bfcf57 (diff) | |
fix buildbreakers in oox, revert token changes for now
Diffstat (limited to 'oox/Library_oox.mk')
| -rw-r--r-- | oox/Library_oox.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 0e74548160ce..2abfb960c461 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,oox,\ -I$(OUTDIR)/inc \ -I$(OUTDIR)/inc/offuh \ -I$(realpath $(SRCDIR)/oox/inc) \ - $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \ )) $(eval $(call gb_Library_add_defs,oox,\ @@ -62,11 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,oox,\ $(gb_STDLIBS) \ )) -$(call gb_Library_use_external,oox,openssl) - -$(eval $(call gb_Library_add_ldflags,oox,\ - $(if $(filter YES,$(SYSTEM_OPENSSL)),$(OPENSSL_LIBS)) \ -)) +$(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) |