diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-25 21:47:33 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-02 15:35:22 +0200 |
| commit | 5c85ba488732e41c31af50ca3013d3fcce2a7e0f (patch) | |
| tree | 40346bebc11642a5acea49e5cd4add568981c179 /Repository.mk | |
| parent | 372fe84b66848dd6cbb60ed4f9327416f9620f7f (diff) | |
Build webdav based on serf if neon is disabled.
(cherry picked from commit dcae0509135c2067635ae3cf84b05dc9fb3d2d02)
Conflicts:
Repository.mk
postprocess/CustomTarget_registry.mk
ucb/Module_ucb.mk
ucb/source/ucp/webdav/webdavservices.cxx
Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 596db953558d..0d7c07d1ecaf 100644 --- a/Repository.mk +++ b/Repository.mk @@ -537,6 +537,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ tvhlp1 \ ucb1 \ ucbhelper \ + $(if $(WITH_WEBDAV),ucpdav1) \ ucpfile1 \ ucpftp1 \ ucpchelp1 \ @@ -569,7 +570,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ - ucpdav1 \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ |