diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:47:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:55:03 -0600 |
| commit | 3273d2385b86bad0d3c3f7595c2f5896cf0b1440 (patch) | |
| tree | aca6e94dccd67fa31fd739832cf3db851c02c149 | |
| parent | fdo#70393: move xsltml to a subdir of external (diff) | |
| download | core-3273d2385b86bad0d3c3f7595c2f5896cf0b1440.tar.gz core-3273d2385b86bad0d3c3f7595c2f5896cf0b1440.zip | |
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>
| -rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/zlib/Makefile (renamed from zlib/Makefile) | 2 | ||||
| -rw-r--r-- | external/zlib/Module_zlib.mk (renamed from zlib/Module_zlib.mk) | 0 | ||||
| -rw-r--r-- | external/zlib/README (renamed from zlib/README) | 0 | ||||
| -rw-r--r-- | external/zlib/StaticLibrary_zlib.mk (renamed from zlib/StaticLibrary_zlib.mk) | 0 | ||||
| -rw-r--r-- | external/zlib/StaticLibrary_zlib_x64.mk (renamed from zlib/StaticLibrary_zlib_x64.mk) | 0 | ||||
| -rw-r--r-- | external/zlib/UnpackedTarball_zlib.mk (renamed from zlib/UnpackedTarball_zlib.mk) | 0 |
9 files changed, 2 insertions, 3 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 4ef18d802a2e..74dcba43b57a 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 15394b828ba8..85223e09c9fd 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 1a9f63ad0fde..4633be319c54 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 index 0997e628485b..569ad8a0ba7a 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 index 7241df0d63e9..7241df0d63e9 100644 --- a/zlib/Module_zlib.mk +++ b/external/zlib/Module_zlib.mk diff --git a/zlib/README b/external/zlib/README index 40187573757b..40187573757b 100644 --- a/zlib/README +++ b/external/zlib/README diff --git a/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk index 3071e614e722..3071e614e722 100644 --- a/zlib/StaticLibrary_zlib.mk +++ b/external/zlib/StaticLibrary_zlib.mk diff --git a/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk index 99a08d55ded5..99a08d55ded5 100644 --- a/zlib/StaticLibrary_zlib_x64.mk +++ b/external/zlib/StaticLibrary_zlib_x64.mk diff --git a/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk index fa476b918b7c..fa476b918b7c 100644 --- a/zlib/UnpackedTarball_zlib.mk +++ b/external/zlib/UnpackedTarball_zlib.mk |