[Libreoffice-commits] core.git: external/Module_external.mk external/neon neon/configs neon/Library_neon.mk neon/Makefile neon/Module_neon.mk neon/neon.def neon/neon_ne_set_request_flag.patch neon/neon.patch neon/neon_with_gnutls.patch neon/README neon/UnpackedTarball_neon.mk RepositoryModule_host.mk

Khaled Hosny khaledhosny at eglug.org
Sat Oct 19 00:52:00 PDT 2013


 RepositoryModule_host.mk                     |    1 
 external/Module_external.mk                  |    1 
 external/neon/Library_neon.mk                |  106 ++++
 external/neon/Makefile                       |    7 
 external/neon/Module_neon.mk                 |   17 
 external/neon/README                         |    1 
 external/neon/UnpackedTarball_neon.mk        |   26 +
 external/neon/configs/config.h               |  600 +++++++++++++++++++++++++++
 external/neon/neon.def                       |  292 +++++++++++++
 external/neon/neon.patch                     |  423 +++++++++++++++++++
 external/neon/neon_ne_set_request_flag.patch |   11 
 external/neon/neon_with_gnutls.patch         |   29 +
 neon/Library_neon.mk                         |  106 ----
 neon/Makefile                                |    7 
 neon/Module_neon.mk                          |   21 
 neon/README                                  |    1 
 neon/UnpackedTarball_neon.mk                 |   26 -
 neon/configs/config.h                        |  600 ---------------------------
 neon/neon.def                                |  292 -------------
 neon/neon.patch                              |  423 -------------------
 neon/neon_ne_set_request_flag.patch          |   11 
 neon/neon_with_gnutls.patch                  |   29 -
 22 files changed, 1513 insertions(+), 1517 deletions(-)

New commits:
commit 5d98836cfb94176c7a50d0836ad8f0c153364063
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 23:02:24 2013 +0200

    fdo#70393: move neon to a subdir of external
    
    Change-Id: I504b69437ca2849a9bf825c67e52a671ec1e1ad8
    Reviewed-on: https://gerrit.libreoffice.org/6348
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index dba46e6..99b24e1 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 c0b95e0..988d477 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
similarity index 100%
rename from neon/Library_neon.mk
rename to external/neon/Library_neon.mk
diff --git a/neon/Makefile b/external/neon/Makefile
similarity index 71%
rename from neon/Makefile
rename to external/neon/Makefile
index ccb1c85..e4968cf 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
similarity index 93%
rename from neon/Module_neon.mk
rename to external/neon/Module_neon.mk
index 26d4b4d..cc2e0cb 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
similarity index 100%
rename from neon/README
rename to external/neon/README
diff --git a/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk
similarity index 81%
rename from neon/UnpackedTarball_neon.mk
rename to external/neon/UnpackedTarball_neon.mk
index a6cb87b..1b922df 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
similarity index 100%
rename from neon/configs/config.h
rename to external/neon/configs/config.h
diff --git a/neon/neon.def b/external/neon/neon.def
similarity index 100%
rename from neon/neon.def
rename to external/neon/neon.def
diff --git a/neon/neon.patch b/external/neon/neon.patch
similarity index 100%
rename from neon/neon.patch
rename to external/neon/neon.patch
diff --git a/neon/neon_ne_set_request_flag.patch b/external/neon/neon_ne_set_request_flag.patch
similarity index 100%
rename from neon/neon_ne_set_request_flag.patch
rename to external/neon/neon_ne_set_request_flag.patch
diff --git a/neon/neon_with_gnutls.patch b/external/neon/neon_with_gnutls.patch
similarity index 100%
rename from neon/neon_with_gnutls.patch
rename to external/neon/neon_with_gnutls.patch


More information about the Libreoffice-commits mailing list