diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
| commit | 6e135ba19ae197fa6b1ca65034ad3dc8876a6be0 (patch) | |
| tree | a33121f11b40eab2724736c768b487cfc3811913 /oox/Library_oox.mk | |
| parent | 96d563c01bcb8d5126a447276d04058075dd25ea (diff) | |
fixing rebase errors
Diffstat (limited to 'oox/Library_oox.mk')
| -rw-r--r-- | oox/Library_oox.mk | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 53bb404333e5..c545c34ca519 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -57,33 +57,7 @@ $(eval $(call gb_Library_add_linked_libs,oox,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_OPENSSL),YES) -$(eval $(call gb_Library_add_linked_libs,oox,\ - crypto \ - ssl \ -)) -else -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,oox,\ - crypto \ - ssl \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,oox,\ - crypto \ - ssl \ -)) -endif -endif - -# this is for openssl -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_linked_libs,oox,\ - nsl \ - socket \ -)) -endif -#probably not necessary: dl \ +$(call gb_Library_use_external,oox,openssl) # object files ---------------------------------------------------------------- |