RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/openldap/ExternalProject_openldap.mk | 43 +++++++++++++++ external/openldap/Makefile | 7 ++ external/openldap/Module_openldap.mk | 21 +++++++ external/openldap/UnpackedTarball_openldap.mk | 18 ++++++ external/openldap/openldap-2.4.31.patch | 73 ++++++++++++++++++++++++++ openldap/ExternalProject_openldap.mk | 43 --------------- openldap/Makefile | 7 -- openldap/Module_openldap.mk | 21 ------- openldap/UnpackedTarball_openldap.mk | 18 ------ openldap/openldap-2.4.31.patch | 73 -------------------------- 12 files changed, 163 insertions(+), 163 deletions(-)
New commits: commit 8339d33a24e9810ae23544f0f4d1a52bd732c49f Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:17:25 2013 +0200 fdo#70393: move openldap to a subdir of external Change-Id: I0225484e976b5317c2ac5d5b50ade153425f22b0 Reviewed-on: https://gerrit.libreoffice.org/6546 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 1b9b9d3..a5500ab 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ officecfg \ oovbaapi \ oox \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ $(call gb_Helper_optional,OPENSSL,openssl) \ package \ padmin \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 8321a2e..23ca67d 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ diff --git a/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk similarity index 100% rename from openldap/ExternalProject_openldap.mk rename to external/openldap/ExternalProject_openldap.mk diff --git a/openldap/Makefile b/external/openldap/Makefile similarity index 71% rename from openldap/Makefile rename to external/openldap/Makefile index ccb1c85..e4968cf 100644 --- a/openldap/Makefile +++ b/external/openldap/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk similarity index 100% rename from openldap/Module_openldap.mk rename to external/openldap/Module_openldap.mk diff --git a/openldap/UnpackedTarball_openldap.mk b/external/openldap/UnpackedTarball_openldap.mk similarity index 92% rename from openldap/UnpackedTarball_openldap.mk rename to external/openldap/UnpackedTarball_openldap.mk index 43e3e2a..f22cb97 100644 --- a/openldap/UnpackedTarball_openldap.mk +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap)) $(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap)) $(eval $(call gb_UnpackedTarball_add_patches,openldap,\ - openldap/openldap-2.4.31.patch \ + external/openldap/openldap-2.4.31.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/openldap/openldap-2.4.31.patch b/external/openldap/openldap-2.4.31.patch similarity index 100% rename from openldap/openldap-2.4.31.patch rename to external/openldap/openldap-2.4.31.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
