diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-01 14:44:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-01 16:55:40 +0200 |
| commit | f7c55abf4f80b3c7228b6fe416e3e548e8adcd26 (patch) | |
| tree | b90a95f8a2590684377ff2c0cd85f1e633de6a5e /apache-commons | |
| parent | 617d89384947223e41bf2ed613af247e2bb7db82 (diff) | |
copy external jars to instdir
Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec
Diffstat (limited to 'apache-commons')
| -rw-r--r-- | apache-commons/ExternalPackage_apache_commons_logging.mk | 16 | ||||
| -rw-r--r-- | apache-commons/Module_apache-commons.mk | 2 | ||||
| -rw-r--r-- | apache-commons/Package_apache_commons_logging.mk | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk b/apache-commons/ExternalPackage_apache_commons_logging.mk new file mode 100644 index 000000000000..41cd2c6d41c2 --- /dev/null +++ b/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -0,0 +1,16 @@ +# -*- 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,apache_commons_logging_inc,apache_commons_logging)) + +$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,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)) + +# vim: set noet sw=4 ts=4: diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk index a89f69e6e94b..4bb62cbc6451 100644 --- a/apache-commons/Module_apache-commons.mk +++ b/apache-commons/Module_apache-commons.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,apache_commons)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,apache_commons,\ + ExternalPackage_apache_commons_logging \ ExternalProject_apache_commons_codec \ ExternalProject_apache_commons_httpclient \ ExternalProject_apache_commons_lang \ @@ -19,7 +20,6 @@ $(eval $(call gb_Module_add_targets,apache_commons,\ Package_apache_commons_codec \ Package_apache_commons_httpclient \ Package_apache_commons_lang \ - Package_apache_commons_logging \ UnpackedTarball_apache_commons_codec \ UnpackedTarball_apache_commons_httpclient \ UnpackedTarball_apache_commons_lang \ diff --git a/apache-commons/Package_apache_commons_logging.mk b/apache-commons/Package_apache_commons_logging.mk deleted file mode 100644 index 24a14eaea950..000000000000 --- a/apache-commons/Package_apache_commons_logging.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_logging_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_logging))) - -$(eval $(call gb_Package_use_external_project,apache_commons_logging_inc,apache_commons_logging)) - -$(eval $(call gb_Package_add_file,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) - -# vim: set noet sw=4 ts=4: |