diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 22:00:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:40 +0200 |
| commit | 4bd53d1a8011988920a33d89b4d70b7d232bdbeb (patch) | |
| tree | 5cb18fb77a2685401215e4e8f7626487f280bc2d | |
| parent | stop looking for Jar files in solver (diff) | |
| download | core-4bd53d1a8011988920a33d89b4d70b7d232bdbeb.tar.gz core-4bd53d1a8011988920a33d89b4d70b7d232bdbeb.zip | |
gbuild: add gb_ExternalProject_use_jars
Change-Id: Idd67548cb5f0e49e539459ed7f2fbd107d37c1b3
| -rw-r--r-- | languagetool/ExternalProject_languagetool.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalProject.mk | 9 |
2 files changed, 17 insertions, 5 deletions
diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk index 0afba90d5f4f..c32434d72e6c 100644 --- a/languagetool/ExternalProject_languagetool.mk +++ b/languagetool/ExternalProject_languagetool.mk @@ -13,11 +13,14 @@ $(eval $(call gb_ExternalProject_register_targets,languagetool,\ build \ )) -$(call gb_ExternalProject_get_state_target,languagetool,build) : \ - $(call gb_Jar_get_target,juh) \ - $(call gb_Jar_get_target,jurt) \ - $(call gb_Jar_get_target,ridl) \ - $(call gb_Jar_get_target,unoil) +$(eval $(call gb_ExternalProject_use_jars,languagetool,\ + juh \ + jurt \ + ridl \ + unoil \ +)) + +$(call gb_ExternalProject_get_state_target,languagetool,build) : cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ $(ICECREAM_RUN) "$(ANT)" \ -q \ diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 9b5466ba86b2..2dd034aa2b0f 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -184,6 +184,15 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : \ endef +# Make an external project depend on a Jar file +# +# gb_ExternalProject_use_jars external jars +define gb_ExternalProject_use_jars +$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(foreach jar,$(2),$(call gb_Jar_get_target,$(lib))) + +endef + # Run a target command # # This provides a wrapper that changes to the right directory, |