libpng: remove ExternalPackage_libpng

Change-Id: I478a057c07b9fe850401b96297a14d7842c0703f

6 files changed, 6 insertions, 24 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5a9c2d50505d..6b4c82fea086 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1875,6 +1875,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
 ))
 
 define gb_LinkTarget__use_png
+$(call gb_LinkTarget_set_include,$(1),\
+	$(LIBPNG_CFLAGS) \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	png \
 )
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index e27bf37d3518..0326b5c05c2c 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
 		COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
 		ZLIB3RDLIB=-lz \
-		$(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
+		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
 		$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
 		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
 		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
diff --git a/configure.ac b/configure.ac
index 50617558fc2f..ec0a4a6ed782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11057,7 +11057,7 @@ dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 
-libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lpng"])
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${OUTDIR}/lib -lpng"])
 
 dnl ===================================================================
 dnl Check for runtime JVM search path
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 \
 ))