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 /jfreereport | |
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 'jfreereport')
11 files changed, 11 insertions, 33 deletions
diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 23fd99b1265f..641497b65a99 100644 --- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine,jfreereport_flow_engine)) $(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ jfreereport_liblayout \ diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk index 7175f5dd8bb6..6332ec24c13a 100644 --- a/jfreereport/ExternalProject_jfreereport_flute.mk +++ b/jfreereport/ExternalProject_jfreereport_flute.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flute,jfreereport_flute)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute,jfreereport_flute)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk index 6b5cf6f0dcb2..f03ffc761133 100644 --- a/jfreereport/ExternalProject_jfreereport_libbase.mk +++ b/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libbase,jfreereport_libbase)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase,jfreereport_libbase)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk index 72e6fb171ea7..3c7474fbbe46 100644 --- a/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libfonts,jfreereport_libfonts)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts,jfreereport_libfonts)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk index b7f6d95b7c0d..5938cf45cdde 100644 --- a/jfreereport/ExternalProject_jfreereport_libformula.mk +++ b/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libformula,jfreereport_libformula)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula,jfreereport_libformula)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk index 4c5d79d1d05c..3c612e58b451 100644 --- a/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout,jfreereport_liblayout)) ifneq ($(SYSTEM_APACHE_COMMONS),YES) $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk index dc3d8d8f1ca4..ffcf2d90a627 100644 --- a/jfreereport/ExternalProject_jfreereport_libloader.mk +++ b/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader,jfreereport_libloader)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk index 215bd1ce90f8..e1c8b1923201 100644 --- a/jfreereport/ExternalProject_jfreereport_librepository.mk +++ b/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_librepository,jfreereport_librepository)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository,jfreereport_librepository)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk index 93cdfd5311fe..bc865bf2884d 100644 --- a/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libserializer,jfreereport_libserializer)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer,jfreereport_libserializer)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk index 93967f58cf41..068f08d8810f 100644 --- a/jfreereport/ExternalProject_jfreereport_libxml.mk +++ b/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libxml,jfreereport_libxml)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml,jfreereport_libxml)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk index 750026887542..2f0b8d102000 100644 --- a/jfreereport/ExternalProject_jfreereport_sac.mk +++ b/jfreereport/ExternalProject_jfreereport_sac.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac,jfreereport_sac)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ build \ |