expat: remove ExternalPackage_expat

Change-Id: I80b7f86947645a45263bbd7423a10ba8300441e9

5 files changed, 3 insertions, 26 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a22c695d2e4..3fa45242243e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -460,14 +460,10 @@ define gb_LinkTarget__use_expat_impl
 $(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
 
 $(call gb_LinkTarget_set_include,$(1),\
-    -I$(OUTDIR)/inc/external/expat \
+	-I$(call gb_UnpackedTarball_get_dir,expat)/lib \
     $$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_use_packages,$(1),\
-	expat_inc \
-)
-
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	$(2) \
 )
@@ -475,7 +471,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 endef
 
 define gb_ExternalProject__use_expat
-$(call gb_ExternalProject_use_package,$(1),expat_inc)
 $(call gb_ExternalProject_use_static_libraries,$(1),expat)
 
 endef
diff --git a/expat/ExternalPackage_expat.mk b/expat/ExternalPackage_expat.mk
deleted file mode 100644
index d969cb4c5d3e..000000000000
--- a/expat/ExternalPackage_expat.mk
+++ /dev/null
@@ -1,17 +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,expat_inc,expat))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,expat_inc,inc/external/expat,\
-	lib/expat.h \
-	lib/expat_external.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/expat/Module_expat.mk b/expat/Module_expat.mk
index 8c7d8d020b91..990a2a3b497b 100644
--- a/expat/Module_expat.mk
+++ b/expat/Module_expat.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,expat))
 ifeq ($(SYSTEM_EXPAT),NO)
 
 $(eval $(call gb_Module_add_targets,expat,\
-	ExternalPackage_expat \
 	UnpackedTarball_expat \
 	StaticLibrary_expat \
 ))
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index f4584f02e1b1..b520a118fc19 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 		./configure \
 			--disable-shared \
 			--with-arch=arm \
-			--with-expat-includes=$(OUTDIR)/inc/external/expat \
+			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
 			--with-expat-lib=$(OUTDIR)/lib \
 			--with-freetype-config=$(OUTDIR)/bin/freetype-config \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index b8953c7e052c..72c476d95e1c 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -88,7 +88,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 		CC="$(strip $(CC) \
 			$(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \
 			$(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \
-			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \
+			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
 			$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \