stop delivering lots of external static libraries

Change-Id: Id0c5908adbdec40346c1b62304d1f72ed077ca54

32 files changed, 3 insertions, 336 deletions

diff --git a/harfbuzz/ExternalPackage_harfbuzz.mk b/harfbuzz/ExternalPackage_harfbuzz.mk
deleted file mode 100644
index e6420aaec9c2..000000000000
--- a/harfbuzz/ExternalPackage_harfbuzz.mk
+++ /dev/null
@@ -1,20 +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,harfbuzz,harfbuzz))
-
-$(eval $(call gb_ExternalPackage_use_external_project,harfbuzz,harfbuzz))
-
-$(eval $(call gb_ExternalPackage_add_files,harfbuzz,lib,\
-	src/.libs/libharfbuzz.a \
-	src/.libs/libharfbuzz-icu.a \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/harfbuzz/Module_harfbuzz.mk b/harfbuzz/Module_harfbuzz.mk
index d3e693f84795..af64eff699e8 100644
--- a/harfbuzz/Module_harfbuzz.mk
+++ b/harfbuzz/Module_harfbuzz.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,harfbuzz))
 ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),TRUE-NO)
 
 $(eval $(call gb_Module_add_targets,harfbuzz,\
-	ExternalPackage_harfbuzz \
 	ExternalProject_harfbuzz \
 	UnpackedTarball_harfbuzz \
 ))
diff --git a/hunspell/ExternalPackage_hunspell.mk b/hunspell/ExternalPackage_hunspell.mk
deleted file mode 100644
index 1cabd1973dd2..000000000000
--- a/hunspell/ExternalPackage_hunspell.mk
+++ /dev/null
@@ -1,20 +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,hunspell,hunspell))
-
-ifneq ($(COM),MSC)
-
-$(eval $(call gb_ExternalPackage_use_external_project,hunspell,hunspell))
-
-$(eval $(call gb_ExternalPackage_add_file,hunspell,lib/libhunspell.a,src/hunspell/.libs/libhunspell-1.3.a))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/hunspell/Module_hunspell.mk b/hunspell/Module_hunspell.mk
index 357873c878de..6acd732ae701 100644
--- a/hunspell/Module_hunspell.mk
+++ b/hunspell/Module_hunspell.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,hunspell))
 ifeq ($(SYSTEM_HUNSPELL),NO)
 $(eval $(call gb_Module_add_targets,hunspell,\
 	UnpackedTarball_hunspell \
-	ExternalPackage_hunspell \
 ))
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,hunspell,\
diff --git a/hyphen/ExternalPackage_hyphen.mk b/hyphen/ExternalPackage_hyphen.mk
index cae07649ff85..13303cc7c903 100644
--- a/hyphen/ExternalPackage_hyphen.mk
+++ b/hyphen/ExternalPackage_hyphen.mk
@@ -9,20 +9,12 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,hyphen,hyphen))
 
-ifneq ($(COM),MSC)
-
-$(eval $(call gb_ExternalPackage_use_external_project,hyphen,hyphen))
-
-ifeq ($(SYSTEM_HYPH),NO)
-$(eval $(call gb_ExternalPackage_add_file,hyphen,lib/libhyphen.a,.libs/libhyphen.a))
-endif
-
-endif
-
 ifeq ($(WITH_MYSPELL_DICTS),YES)
-$(eval $(call gb_ExternalPackage_add_files,hyphen,bin,\
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,hyphen,bin,\
     hyph_en_US.dic \
 ))
+
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
deleted file mode 100644
index 908ce60522c5..000000000000
--- a/libcdr/ExternalPackage_libcdr.mk
+++ /dev/null
@@ -1,21 +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,libcdr,libcdr))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,src/lib/.libs/libcdr-0.0.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
index 9074a9e9aae3..5e5726d72b08 100644
--- a/libcdr/Module_libcdr.mk
+++ b/libcdr/Module_libcdr.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libcdr))
 ifeq ($(SYSTEM_CDR),NO)
 
 $(eval $(call gb_Module_add_targets,libcdr,\
-	ExternalPackage_libcdr \
 	ExternalProject_libcdr \
 	UnpackedTarball_libcdr \
 ))
diff --git a/libexttextcat/ExternalPackage_exttextcat.mk b/libexttextcat/ExternalPackage_exttextcat.mk
deleted file mode 100644
index 11a2acb8690a..000000000000
--- a/libexttextcat/ExternalPackage_exttextcat.mk
+++ /dev/null
@@ -1,16 +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,exttextcat,exttextcat))
-
-$(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat))
-
-$(eval $(call gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-2.0.a))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/Module_libexttextcat.mk b/libexttextcat/Module_libexttextcat.mk
index 29c48158aed6..c1396de388e4 100644
--- a/libexttextcat/Module_libexttextcat.mk
+++ b/libexttextcat/Module_libexttextcat.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\
 ))
 else
 $(eval $(call gb_Module_add_targets,libexttextcat,\
-	ExternalPackage_exttextcat \
 	ExternalProject_exttextcat \
 ))
 endif
diff --git a/liblangtag/ExternalPackage_langtag.mk b/liblangtag/ExternalPackage_langtag.mk
deleted file mode 100644
index 02816dd35611..000000000000
--- a/liblangtag/ExternalPackage_langtag.mk
+++ /dev/null
@@ -1,20 +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,langtag,langtag))
-
-$(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/liblangtag.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.a,liblangtag/.libs/liblangtag.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk
index 3d68c54810d6..a1bcdab62748 100644
--- a/liblangtag/Module_liblangtag.mk
+++ b/liblangtag/Module_liblangtag.mk
@@ -15,7 +15,6 @@ ifeq ($(SYSTEM_LIBLANGTAG),NO)
 $(eval $(call gb_Module_add_targets,liblangtag,\
 	UnpackedTarball_langtag \
 	ExternalPackage_langtag_data \
-	ExternalPackage_langtag \
 	ExternalProject_langtag \
 	ExternalPackage_liblangtag_data \
 ))
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
deleted file mode 100644
index 8ecc85d2dd8e..000000000000
--- a/libmspub/ExternalPackage_libmspub.mk
+++ /dev/null
@@ -1,21 +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,libmspub,libmspub))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,src/lib/.libs/libmspub-0.0.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
index 12cdfd316a4b..0755acae9c6e 100644
--- a/libmspub/Module_libmspub.mk
+++ b/libmspub/Module_libmspub.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libmspub))
 ifeq ($(SYSTEM_MSPUB),NO)
 
 $(eval $(call gb_Module_add_targets,libmspub,\
-	ExternalPackage_libmspub \
 	ExternalProject_libmspub \
 	UnpackedTarball_libmspub \
 ))
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk
deleted file mode 100644
index 578054fe67b1..000000000000
--- a/libmwaw/ExternalPackage_libmwaw.mk
+++ /dev/null
@@ -1,21 +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,libmwaw,libmwaw))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,src/lib/.libs/libmwaw-0.1.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.1.a,src/lib/.libs/libmwaw-0.1.a))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/Module_libmwaw.mk b/libmwaw/Module_libmwaw.mk
index 5c6766d73989..36e756121798 100644
--- a/libmwaw/Module_libmwaw.mk
+++ b/libmwaw/Module_libmwaw.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libmwaw))
 ifeq ($(SYSTEM_MWAW),NO)
 
 $(eval $(call gb_Module_add_targets,libmwaw,\
-	ExternalPackage_libmwaw \
 	ExternalProject_libmwaw \
 	UnpackedTarball_libmwaw \
 ))
diff --git a/libodfgen/ExternalPackage_libodfgen.mk b/libodfgen/ExternalPackage_libodfgen.mk
deleted file mode 100644
index ad7a3d1dd501..000000000000
--- a/libodfgen/ExternalPackage_libodfgen.mk
+++ /dev/null
@@ -1,21 +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,libodfgen,libodfgen))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,lib/odfgen-0.0.lib,src/.libs/libodfgen-0.0.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,lib/libodfgen-0.0.a,src/.libs/libodfgen-0.0.a))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/libodfgen/Module_libodfgen.mk b/libodfgen/Module_libodfgen.mk
index d20392f30d10..ca58a2748f6c 100644
--- a/libodfgen/Module_libodfgen.mk
+++ b/libodfgen/Module_libodfgen.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libodfgen))
 ifeq ($(SYSTEM_ODFGEN),NO)
 
 $(eval $(call gb_Module_add_targets,libodfgen,\
-	ExternalPackage_libodfgen \
 	ExternalProject_libodfgen \
 	UnpackedTarball_libodfgen \
 ))
diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk
deleted file mode 100644
index 1f2a68c6afb9..000000000000
--- a/libvisio/ExternalPackage_libvisio.mk
+++ /dev/null
@@ -1,21 +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,libvisio,libvisio))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,src/lib/.libs/libvisio-0.0.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libvisio,lib/libvisio-0.0.a,src/lib/.libs/libvisio-0.0.a))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk
index 56ef74cf139f..9a8159f08489 100644
--- a/libvisio/Module_libvisio.mk
+++ b/libvisio/Module_libvisio.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libvisio))
 ifeq ($(SYSTEM_VISIO),NO)
 
 $(eval $(call gb_Module_add_targets,libvisio,\
-	ExternalPackage_libvisio \
 	ExternalProject_libvisio \
 	UnpackedTarball_libvisio \
 ))
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
deleted file mode 100644
index 2e7cd0955a0a..000000000000
--- a/libwpd/ExternalPackage_libwpd.mk
+++ /dev/null
@@ -1,20 +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,libwpd,libwpd))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,src/lib/.libs/libwpd-0.9.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index 401644a9d36f..f852c5cc6281 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_WPD),NO)
 
 $(eval $(call gb_Module_add_targets,libwpd,\
 	ExternalProject_libwpd \
-	ExternalPackage_libwpd \
 	UnpackedTarball_libwpd \
 ))
 
diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk
deleted file mode 100644
index b804836ba099..000000000000
--- a/libwpg/ExternalPackage_libwpg.mk
+++ /dev/null
@@ -1,20 +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,libwpg,libwpg))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libwpg,lib/wpg-0.2.lib,src/lib/.libs/libwpg-0.2.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libwpg,lib/libwpg-0.2.a,src/lib/.libs/libwpg-0.2.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
index 17abb6853460..411e71f9eb31 100644
--- a/libwpg/Module_libwpg.mk
+++ b/libwpg/Module_libwpg.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_WPG),NO)
 
 $(eval $(call gb_Module_add_targets,libwpg,\
 	ExternalProject_libwpg \
-	ExternalPackage_libwpg \
 	UnpackedTarball_libwpg \
 ))
 
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk
deleted file mode 100644
index 960ae1b45aa9..000000000000
--- a/libwps/ExternalPackage_libwps.mk
+++ /dev/null
@@ -1,20 +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,libwps,libwps))
-
-$(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libwps,lib/wps-0.2.lib,src/lib/.libs/libwps-0.2.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,libwps,lib/libwps-0.2.a,src/lib/.libs/libwps-0.2.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
index c5fd1660bdac..ee163f09060b 100644
--- a/libwps/Module_libwps.mk
+++ b/libwps/Module_libwps.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_WPS),NO)
 
 $(eval $(call gb_Module_add_targets,libwps,\
 	ExternalProject_libwps \
-	ExternalPackage_libwps \
 	UnpackedTarball_libwps \
 ))
 
diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk
deleted file mode 100644
index cd8907ccede8..000000000000
--- a/mythes/ExternalPackage_mythes.mk
+++ /dev/null
@@ -1,20 +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,mythes,mythes))
-
-ifneq ($(COM),MSC)
-
-$(eval $(call gb_ExternalPackage_use_external_project,mythes,mythes))
-
-$(eval $(call gb_ExternalPackage_add_file,mythes,lib/libmythes.a,.libs/libmythes-1.2.a))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/mythes/Module_mythes.mk b/mythes/Module_mythes.mk
index 7a210c02d933..4d9ac64ee926 100644
--- a/mythes/Module_mythes.mk
+++ b/mythes/Module_mythes.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,mythes))
 ifeq ($(SYSTEM_MYTHES),NO)
 $(eval $(call gb_Module_add_targets,mythes,\
 	UnpackedTarball_mythes \
-	ExternalPackage_mythes \
 ))
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,mythes,\
diff --git a/openldap/ExternalPackage_openldap.mk b/openldap/ExternalPackage_openldap.mk
deleted file mode 100644
index daacf1fda1f1..000000000000
--- a/openldap/ExternalPackage_openldap.mk
+++ /dev/null
@@ -1,20 +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,openldap,openldap))
-
-$(eval $(call gb_ExternalPackage_use_external_project,openldap,openldap))
-
-$(eval $(call gb_ExternalPackage_add_files,openldap,lib,\
-	libraries/libldap/.libs/libldap.a \
-	libraries/libldap_r/.libs/libldap_r.a \
-	libraries/liblber/.libs/liblber.a \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/openldap/Module_openldap.mk b/openldap/Module_openldap.mk
index 658695cb8b52..cb3f0ce23b5d 100644
--- a/openldap/Module_openldap.mk
+++ b/openldap/Module_openldap.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,openldap))
 ifeq ($(SYSTEM_OPENLDAP),NO)
 
 $(eval $(call gb_Module_add_targets,openldap,\
-	ExternalPackage_openldap \
 	ExternalProject_openldap \
 	UnpackedTarball_openldap \
 ))
diff --git a/openssl/ExternalPackage_openssl.mk b/openssl/ExternalPackage_openssl.mk
index a707bb88f4af..8d1986900c89 100644
--- a/openssl/ExternalPackage_openssl.mk
+++ b/openssl/ExternalPackage_openssl.mk
@@ -20,10 +20,5 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\
 	out32dll/ssleay32.dll \
 	out32dll/libeay32.dll \
 ))
-else
-$(eval $(call gb_ExternalPackage_add_files,openssl,lib,\
-	libcrypto.a \
-	libssl.a \
-))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/poppler/ExternalPackage_poppler.mk b/poppler/ExternalPackage_poppler.mk
deleted file mode 100644
index 9e3e687ec09b..000000000000
--- a/poppler/ExternalPackage_poppler.mk
+++ /dev/null
@@ -1,24 +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,poppler,poppler))
-
-$(eval $(call gb_ExternalPackage_use_external_project,poppler,poppler))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/poppler.lib,poppler/.libs/libpoppler.lib))
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/fofi.lib,fofi/.libs/libfofi.lib))
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/goo.lib,goo/.libs/libgoo.lib))
-else
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/libpoppler.a,poppler/.libs/libpoppler.a))
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/libfofi.a,fofi/.libs/libfofi.a))
-$(eval $(call gb_ExternalPackage_add_file,poppler,lib/libgoo.a,goo/.libs/libgoo.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/poppler/Module_poppler.mk b/poppler/Module_poppler.mk
index 953c4d01f83f..910145a138f0 100644
--- a/poppler/Module_poppler.mk
+++ b/poppler/Module_poppler.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_POPPLER),NO)
 
 $(eval $(call gb_Module_add_targets,poppler,\
 	ExternalProject_poppler \
-	ExternalPackage_poppler \
 	UnpackedTarball_poppler \
 ))