diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-22 21:56:29 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-04-22 23:45:55 +0200 |
| commit | 237446b38631c2a40c227e96f7f8c30b9c3932b4 (patch) | |
| tree | 131d291c0cc5c0170563fdd81566afe57ea0275d /ucb/Library_ucpdav1.mk | |
| parent | 1c1226709c6be39c5462f5e6e1262ca630b30b34 (diff) | |
fix component handling for ucpdav1 when --with-webdav=serf
Both the webdav=neon and webdav=serf cases were actually using
the same ucpdav1.component file. And f3f0d05f72d8dbd9717910b4d6b4
changed component handling for neon, but not for serf.
So separate component handling for neon and for serf, and also
do the f3f0d05 change also for the serf case.
Change-Id: Id5907cf1c8fbb93817e81295f71ad87191fe5c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114525
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'ucb/Library_ucpdav1.mk')
| -rw-r--r-- | ucb/Library_ucpdav1.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index b9e1d1037897..127d046eb72b 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Library_Library,ucpdav1)) -$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1)) - $(eval $(call gb_Library_use_sdk_api,ucpdav1)) $(eval $(call gb_Library_set_include,ucpdav1,\ @@ -31,6 +29,8 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ ifeq ($(WITH_WEBDAV),neon) +$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ libxml2 \ @@ -69,6 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ else # WITH_WEBDAV == serf +$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ apr \ @@ -110,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ucb/source/ucp/webdav/webdavprovider \ ucb/source/ucp/webdav/webdavresponseparser \ ucb/source/ucp/webdav/webdavresultset \ - ucb/source/ucp/webdav/webdavservices \ )) endif # WITH_WEBDAV |