diff options
Diffstat (limited to 'libpng')
| -rw-r--r-- | libpng/ExternalPackage_libpng.mk | 19 | ||||
| -rw-r--r-- | libpng/Module_libpng.mk | 1 | ||||
| -rw-r--r-- | libpng/StaticLibrary_png.mk | 2 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libpng/ExternalPackage_libpng.mk b/libpng/ExternalPackage_libpng.mk deleted file mode 100644 index 6fb731da2b4c..000000000000 --- a/libpng/ExternalPackage_libpng.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_ExternalPackage_ExternalPackage,libpng_inc,png)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,libpng_inc,inc/external/libpng,\ - png.h \ - pngconf.h \ - pnglibconf.h \ - pngstruct.h \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/libpng/Module_libpng.mk b/libpng/Module_libpng.mk index 6ee8e4cf4d58..d61375d18d05 100644 --- a/libpng/Module_libpng.mk +++ b/libpng/Module_libpng.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libpng)) ifeq ($(SYSTEM_LIBPNG),NO) $(eval $(call gb_Module_add_targets,libpng,\ - ExternalPackage_libpng \ StaticLibrary_png \ UnpackedTarball_png \ )) diff --git a/libpng/StaticLibrary_png.mk b/libpng/StaticLibrary_png.mk index 3efcc4bdcf3d..8759cafc0fa0 100644 --- a/libpng/StaticLibrary_png.mk +++ b/libpng/StaticLibrary_png.mk @@ -13,8 +13,6 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,png)) $(eval $(call gb_StaticLibrary_use_unpacked,png,png)) -$(eval $(call gb_StaticLibrary_use_package,png,libpng_inc)) - $(eval $(call gb_StaticLibrary_use_externals,png,\ zlib \ )) |