fdo#70393: move neon to a subdir of external

Change-Id: I504b69437ca2849a9bf825c67e52a671ec1e1ad8
Reviewed-on: https://gerrit.libreoffice.org/6348Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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) \

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) \

neon/Makefile → 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:

neon/Module_neon.mk → 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:

neon/UnpackedTarball_neon.mk → 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: