[Libreoffice-commits] core.git: external/Module_external.mk external/zlib RepositoryModule_build.mk RepositoryModule_host.mk zlib/Makefile zlib/Module_zlib.mk zlib/README zlib/StaticLibrary_zlib.mk zlib/StaticLibrary_zlib_x64.mk zlib/UnpackedTarball_zlib.mk

[Khaled Hosny]

 RepositoryModule_build.mk               |    1 
 RepositoryModule_host.mk                |    1 
 external/Module_external.mk             |    1 
 external/zlib/Makefile                  |   14 ++++++++++++
 external/zlib/Module_zlib.mk            |   27 ++++++++++++++++++++++++
 external/zlib/README                    |    1 
 external/zlib/StaticLibrary_zlib.mk     |   32 +++++++++++++++++++++++++++++
 external/zlib/StaticLibrary_zlib_x64.mk |   35 ++++++++++++++++++++++++++++++++
 external/zlib/UnpackedTarball_zlib.mk   |   19 +++++++++++++++++
 zlib/Makefile                           |   14 ------------
 zlib/Module_zlib.mk                     |   27 ------------------------
 zlib/README                             |    1 
 zlib/StaticLibrary_zlib.mk              |   32 -----------------------------
 zlib/StaticLibrary_zlib_x64.mk          |   35 --------------------------------
 zlib/UnpackedTarball_zlib.mk            |   19 -----------------
 15 files changed, 129 insertions(+), 130 deletions(-)

New commits:
commit 3273d2385b86bad0d3c3f7595c2f5896cf0b1440
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:47:18 2013 +0200

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

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 4ef18d8..74dcba4 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		xmlhelp \
 	) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
-	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 15394b8..85223e0 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	xmlreader \
 	xmlscript \
 	xmlsecurity \
-	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 ifneq ($(MERGELIBS),)
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 1a9f63a..4633be3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,XSLTML,xsltml) \
+	$(call gb_Helper_optional,ZLIB,zlib) \
 	$(call gb_Helper_optional_for_host,DESKTOP, \
 		$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
 			$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
diff --git a/zlib/Makefile b/external/zlib/Makefile
similarity index 86%
rename from zlib/Makefile
rename to external/zlib/Makefile
index 0997e62..569ad8a 100644
--- a/zlib/Makefile
+++ b/external/zlib/Makefile
@@ -9,6 +9,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/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
similarity index 100%
rename from zlib/Module_zlib.mk
rename to external/zlib/Module_zlib.mk
diff --git a/zlib/README b/external/zlib/README
similarity index 100%
rename from zlib/README
rename to external/zlib/README
diff --git a/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk
similarity index 100%
rename from zlib/StaticLibrary_zlib.mk
rename to external/zlib/StaticLibrary_zlib.mk
diff --git a/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk
similarity index 100%
rename from zlib/StaticLibrary_zlib_x64.mk
rename to external/zlib/StaticLibrary_zlib_x64.mk
diff --git a/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk
similarity index 100%
rename from zlib/UnpackedTarball_zlib.mk
rename to external/zlib/UnpackedTarball_zlib.mk