diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-06 22:54:30 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-07 01:41:25 +0200 |
| commit | 276021c76102e685c7dbe3776d5f79f71a59ac82 (patch) | |
| tree | 1871a3da15df78aa3afe894d951515e095e89223 /apache-commons | |
| parent | 96907bfb02c00d3d3d4085fc4b10d8e0eb0b9f11 (diff) | |
gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.
Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
Diffstat (limited to 'apache-commons')
4 files changed, 4 insertions, 12 deletions
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk index 6a92937d88a8..753041cc9284 100644 --- a/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/apache-commons/ExternalProject_apache_commons_codec.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec,apache_commons_codec)) $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\ build \ diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index aaf1520a6be6..314cdf293ce1 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_httpclient,apache_commons_httpclient)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient,apache_commons_httpclient)) $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec)) $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging)) diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk index 283375eb8d2a..5b5b10326808 100644 --- a/apache-commons/ExternalProject_apache_commons_lang.mk +++ b/apache-commons/ExternalProject_apache_commons_lang.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_lang,apache_commons_lang)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang,apache_commons_lang)) $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\ build \ diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk index 22ae742ef88c..11bf6bc7793f 100644 --- a/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/apache-commons/ExternalProject_apache_commons_logging.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging,apache_commons_logging)) # TODO: this should go into RepositoryExternal.mk ifneq ($(SYSTEM_TOMCAT),YES) |