fdo#70393: move zlib to a subdir of external

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

6 files changed, 0 insertions, 128 deletions

diff --git a/zlib/Makefile b/zlib/Makefile
deleted file mode 100644
index 0997e628485b..000000000000
--- a/zlib/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/zlib/Module_zlib.mk b/zlib/Module_zlib.mk
deleted file mode 100644
index 7241df0d63e9..000000000000
--- a/zlib/Module_zlib.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,zlib))
-
-ifeq ($(SYSTEM_ZLIB),NO)
-
-$(eval $(call gb_Module_add_targets,zlib,\
-	StaticLibrary_zlib \
-	UnpackedTarball_zlib \
-))
-
-ifeq ($(BUILD_X64),TRUE)
-$(eval $(call gb_Module_add_targets,zlib,\
-	StaticLibrary_zlib_x64 \
-))
-endif
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/zlib/README b/zlib/README
deleted file mode 100644
index 40187573757b..000000000000
--- a/zlib/README
+++ /dev/null
@@ -1 +0,0 @@
-Compression library from [http://www.zlib.net/].
diff --git a/zlib/StaticLibrary_zlib.mk b/zlib/StaticLibrary_zlib.mk
deleted file mode 100644
index 3071e614e722..000000000000
--- a/zlib/StaticLibrary_zlib.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,zlib))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,zlib,zlib))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
-	UnpackedTarball/zlib/adler32 \
-	UnpackedTarball/zlib/compress \
-	UnpackedTarball/zlib/crc32 \
-	UnpackedTarball/zlib/deflate \
-	UnpackedTarball/zlib/gzclose \
-	UnpackedTarball/zlib/gzlib \
-	UnpackedTarball/zlib/gzread \
-	UnpackedTarball/zlib/gzwrite \
-	UnpackedTarball/zlib/inffast \
-	UnpackedTarball/zlib/inflate \
-	UnpackedTarball/zlib/inftrees \
-	UnpackedTarball/zlib/trees \
-	UnpackedTarball/zlib/zutil \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/zlib/StaticLibrary_zlib_x64.mk b/zlib/StaticLibrary_zlib_x64.mk
deleted file mode 100644
index 99a08d55ded5..000000000000
--- a/zlib/StaticLibrary_zlib_x64.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,zlib_x64))
-
-$(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib_x64))
-
-$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\
-	-I$(call gb_UnpackedTarball_get_dir,zlib) \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\
-	UnpackedTarball/zlib/x64/adler32 \
-	UnpackedTarball/zlib/x64/compress \
-	UnpackedTarball/zlib/x64/crc32 \
-	UnpackedTarball/zlib/x64/deflate \
-	UnpackedTarball/zlib/x64/inffast \
-	UnpackedTarball/zlib/x64/inflate \
-	UnpackedTarball/zlib/x64/inftrees \
-	UnpackedTarball/zlib/x64/trees \
-	UnpackedTarball/zlib/x64/zutil \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/zlib/UnpackedTarball_zlib.mk b/zlib/UnpackedTarball_zlib.mk
deleted file mode 100644
index fa476b918b7c..000000000000
--- a/zlib/UnpackedTarball_zlib.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,zlib))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,zlib,$(ZLIB_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_post_action,zlib,\
-	mkdir -p x64 && \
-	cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate inftrees trees zutil) x64 \
-))
-
-# vim: set noet sw=4 ts=4: