12 files changed, 53 insertions, 69 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2232710872cb..57e8d6bc2384 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2820,27 +2820,31 @@ $(eval $(call gb_Helper_register_jars,OXT,\
 ))
 
 define gb_Jar__use_commons-codec
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-codec-1.6.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_codec)
+$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar,commons-codec-1.6.jar)
 endef
 define gb_ExternalProject__use_commons-codec
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
 endef
 
 define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient)
+$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar)
 endef
 define gb_ExternalProject__use_commons-httpclient
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient)
 endef
 
 define gb_Jar__use_commons-lang
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_lang)
+$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar,commons-lang-2.4.jar)
 endef
 define gb_ExternalProject__use_commons-lang
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
 endef
 
 define gb_Jar__use_commons-logging
+$(call gb_Jar_use_external_project,$(1),apache_commons_logging)
 $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1)
 endef
 define gb_ExternalProject__use_commons-logging
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index 41cd2c6d41c2..992810f17417 100644
--- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging_inc,apache_commons_logging))
+$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging))
 
-$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging))
+$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging))
 
-$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk
index 59d25ebb8263..1dcac4da4c4d 100644
--- a/external/apache-commons/Module_apache-commons.mk
+++ b/external/apache-commons/Module_apache-commons.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_targets,apache-commons,\
 	ExternalProject_apache_commons_httpclient \
 	ExternalProject_apache_commons_lang \
 	ExternalProject_apache_commons_logging \
-	Package_apache_commons_codec \
-	Package_apache_commons_httpclient \
-	Package_apache_commons_lang \
 	UnpackedTarball_apache_commons_codec \
 	UnpackedTarball_apache_commons_httpclient \
 	UnpackedTarball_apache_commons_lang \
diff --git a/external/apache-commons/Package_apache_commons_codec.mk b/external/apache-commons/Package_apache_commons_codec.mk
deleted file mode 100644
index 65d302b31357..000000000000
--- a/external/apache-commons/Package_apache_commons_codec.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_Package_Package,apache_commons_codec_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)))
-
-$(eval $(call gb_Package_use_external_project,apache_commons_codec_inc,apache_commons_codec))
-
-$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.6.jar,dist/commons-codec-1.6-SNAPSHOT.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Package_apache_commons_httpclient.mk b/external/apache-commons/Package_apache_commons_httpclient.mk
deleted file mode 100644
index dd21d777a97e..000000000000
--- a/external/apache-commons/Package_apache_commons_httpclient.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_Package_Package,apache_commons_httpclient_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)))
-
-$(eval $(call gb_Package_use_external_project,apache_commons_httpclient_inc,apache_commons_httpclient))
-
-$(eval $(call gb_Package_add_file,apache_commons_httpclient_inc,bin/commons-httpclient-3.1.jar,dist/commons-httpclient.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Package_apache_commons_lang.mk b/external/apache-commons/Package_apache_commons_lang.mk
deleted file mode 100644
index a9c1eb375d1d..000000000000
--- a/external/apache-commons/Package_apache_commons_lang.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_Package_Package,apache_commons_lang_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)))
-
-$(eval $(call gb_Package_use_external_project,apache_commons_lang_inc,apache_commons_lang))
-
-$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.4.jar,dist/commons-lang-2.4.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 08b86134cedc..d88b1c9f58e5 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -23,7 +23,9 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+				-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+				-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \
 			-Dlib=$(OUTDIR)/bin \
 			$(if $(filter yes,$(JAVACISGCJ))\
 				,-Dbuild.compiler=gcj \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index cddbef1d32ed..b7be4eda163f 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -9,11 +9,9 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
 
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
-	apache_commons_logging_inc \
+$(eval $(call gb_ExternalProject_use_externals,jfreereport_liblayout,\
+	commons-logging \
 ))
-endif
 
 $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
 	jfreereport_sac \
@@ -37,7 +35,9 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+				-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+				-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \
 			$(if $(filter yes,$(JAVACISGCJ))\
 				,-Dbuild.compiler=gcj \
 				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index da5be96e1299..d98259eb53f1 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -278,6 +278,15 @@ $(call gb_Extension__get_preparation_target,$(1)) \
 
 endef
 
+# Add a dependency on an ExternalProject.
+#
+# call gb_Extension_use_external_project,extension,externalproject
+define gb_Extension_use_external_project
+$(call gb_Extension__get_preparation_target,$(1)) \
+	:| $(call gb_ExternalProject_get_target,$(2))
+
+endef
+
 define gb_Extension_use_package
 $(call gb_Extension__get_preparation_target,$(1)) \
 	:| $(call gb_Package_get_target,$(2))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 2c6ba148a711..62e33d537916 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -221,10 +221,11 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
 
 endef
 
+# call gb_Jar_use_external_jar,jar,externaljarfullpath,manifestentry
 define gb_Jar_use_external_jar
+$(if $(3),,$(call gb_Output_error,gb_Jar_use_external_jar: manifest entry missing))
 $(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))
-$(call gb_Jar_get_target,$(1)) : $(2)
+$(call gb_Jar_add_manifest_classpath,$(1),$(3))
 
 endef
 
@@ -283,6 +284,13 @@ $(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget))
 
 endef
 
+# Add a dependency on an ExternalProject.
+#
+# call gb_Jar_use_external_project,jar,externalproject
+define gb_Jar_use_external_project
+$(call gb_JavaClassSet_use_external_project,$(call gb_Jar_get_classsetname,$(1)),$(2))
+endef
+
 # possible directories for jar files containing UNO services 
 gb_Jar_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 806300820d3a..5d967493f786 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -197,4 +197,10 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_CustomTarget_get_workdir,$(2
 
 endef
 
+define gb_JavaClassSet_use_external_project
+$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
+	$(call gb_ExternalProject_get_target,$(2))
+
+endef
+
 # vim: set noet sw=4:
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 7dc713c6ae2e..5e04323e180b 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -13,14 +13,20 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
 
 $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
 
+$(eval $(call gb_Extension_use_package,wiki-publisher,apache_commons_logging))
+
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec))
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
+
 $(eval $(call gb_Extension_use_default_description,wiki-publisher))
 $(eval $(call gb_Extension_use_default_license,wiki-publisher))
 
 ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(OUTDIR)/bin/commons-codec-1.6.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(OUTDIR)/bin/commons-lang-2.4.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar))
 endif
 $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))
 $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))