From 461d830ed8f664e171245b0cf9d53dc33a0f04d2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 25 Oct 2013 18:40:48 +0200 Subject: stop using apache-commons jars from OUTDIR too Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1 --- .../ExternalPackage_apache_commons_logging.mk | 6 +++--- external/apache-commons/Module_apache-commons.mk | 3 --- external/apache-commons/Package_apache_commons_codec.mk | 16 ---------------- .../apache-commons/Package_apache_commons_httpclient.mk | 16 ---------------- external/apache-commons/Package_apache_commons_lang.mk | 16 ---------------- 5 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 external/apache-commons/Package_apache_commons_codec.mk delete mode 100644 external/apache-commons/Package_apache_commons_httpclient.mk delete mode 100644 external/apache-commons/Package_apache_commons_lang.mk (limited to 'external/apache-commons') 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: -- cgit v1.2.3