diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 23:02:24 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:51:40 +0000 |
| commit | 5d98836cfb94176c7a50d0836ad8f0c153364063 (patch) | |
| tree | 8ba785d89f7c2223ded0186943dda61523813bad | |
| parent | fix path after move to external (diff) | |
| download | core-5d98836cfb94176c7a50d0836ad8f0c153364063.tar.gz core-5d98836cfb94176c7a50d0836ad8f0c153364063.zip | |
fdo#70393: move neon to a subdir of external
Change-Id: I504b69437ca2849a9bf825c67e52a671ec1e1ad8
Reviewed-on: https://gerrit.libreoffice.org/6348
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/neon/Library_neon.mk (renamed from neon/Library_neon.mk) | 0 | ||||
| -rw-r--r-- | external/neon/Makefile (renamed from neon/Makefile) | 2 | ||||
| -rw-r--r-- | external/neon/Module_neon.mk (renamed from neon/Module_neon.mk) | 4 | ||||
| -rw-r--r-- | external/neon/README (renamed from neon/README) | 0 | ||||
| -rw-r--r-- | external/neon/UnpackedTarball_neon.mk (renamed from neon/UnpackedTarball_neon.mk) | 8 | ||||
| -rw-r--r-- | external/neon/configs/config.h (renamed from neon/configs/config.h) | 0 | ||||
| -rw-r--r-- | external/neon/neon.def (renamed from neon/neon.def) | 0 | ||||
| -rw-r--r-- | external/neon/neon.patch (renamed from neon/neon.patch) | 0 | ||||
| -rw-r--r-- | external/neon/neon_ne_set_request_flag.patch (renamed from neon/neon_ne_set_request_flag.patch) | 0 | ||||
| -rw-r--r-- | external/neon/neon_with_gnutls.patch (renamed from neon/neon_with_gnutls.patch) | 0 |
12 files changed, 6 insertions, 10 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index dba46e69bc1e..99b24e1342dd 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ - $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ np_sdk \ $(call gb_Helper_optional,NSS,nss) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index c0b95e0f29ab..988d477897d3 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ $(call gb_Helper_optional,MYTHES,mythes) \ + $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,VISIO,libvisio) \ diff --git a/neon/Library_neon.mk b/external/neon/Library_neon.mk index d391a3ea3472..d391a3ea3472 100644 --- a/neon/Library_neon.mk +++ b/external/neon/Library_neon.mk diff --git a/neon/Makefile b/external/neon/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/neon/Makefile +++ b/external/neon/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/neon/Module_neon.mk b/external/neon/Module_neon.mk index 26d4b4d6d896..cc2e0cb5e2a6 100644 --- a/neon/Module_neon.mk +++ b/external/neon/Module_neon.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,neon)) -ifeq ($(SYSTEM_NEON),NO) - $(eval $(call gb_Module_add_targets,neon,\ Library_neon \ UnpackedTarball_neon \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/neon/README b/external/neon/README index 9a40fd74890b..9a40fd74890b 100644 --- a/neon/README +++ b/external/neon/README diff --git a/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk index a6cb87b54e19..1b922df83d49 100644 --- a/neon/UnpackedTarball_neon.mk +++ b/external/neon/UnpackedTarball_neon.mk @@ -12,15 +12,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,neon)) $(eval $(call gb_UnpackedTarball_set_tarball,neon,$(NEON_TARBALL))) $(eval $(call gb_UnpackedTarball_add_files,neon,src,\ - neon/configs/config.h \ + external/neon/configs/config.h \ )) $(eval $(call gb_UnpackedTarball_set_patchlevel,neon,0)) $(eval $(call gb_UnpackedTarball_add_patches,neon,\ - neon/neon.patch \ - neon/neon_ne_set_request_flag.patch \ - neon/neon_with_gnutls.patch \ + external/neon/neon.patch \ + external/neon/neon_ne_set_request_flag.patch \ + external/neon/neon_with_gnutls.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/neon/configs/config.h b/external/neon/configs/config.h index b0fdf22559e3..b0fdf22559e3 100644 --- a/neon/configs/config.h +++ b/external/neon/configs/config.h diff --git a/neon/neon.def b/external/neon/neon.def index 3a14d66fbdfe..3a14d66fbdfe 100644 --- a/neon/neon.def +++ b/external/neon/neon.def diff --git a/neon/neon.patch b/external/neon/neon.patch index 95d6b55024b3..95d6b55024b3 100644 --- a/neon/neon.patch +++ b/external/neon/neon.patch diff --git a/neon/neon_ne_set_request_flag.patch b/external/neon/neon_ne_set_request_flag.patch index 3bcafd62fee6..3bcafd62fee6 100644 --- a/neon/neon_ne_set_request_flag.patch +++ b/external/neon/neon_ne_set_request_flag.patch diff --git a/neon/neon_with_gnutls.patch b/external/neon/neon_with_gnutls.patch index ed8b7faadebf..ed8b7faadebf 100644 --- a/neon/neon_with_gnutls.patch +++ b/external/neon/neon_with_gnutls.patch |