diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-20 15:30:38 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-23 16:42:59 +0100 |
| commit | 07a87420ade12155b14be40e38a09a9ad0061719 (patch) | |
| tree | dda0df97299e3aaaa01eacee87a5cf4e2b2000be /solenv/gbuild/JavaClassSet.mk | |
| parent | 22ebb32863f7874ccd1d39881140a0bbcbc5f72a (diff) | |
eval at the calling side, like other gbuild classes
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 4c8d7cfc5603..61cb4e83bc31 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -62,6 +62,7 @@ $(call gb_JavaClassSet_get_clean_target,%) : define gb_JavaClassSet_JavaClassSet $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := + endef define gb_JavaClassSet__get_sourcefile @@ -69,8 +70,8 @@ $(SRCDIR)/$(1).java endef define gb_JavaClassSet_add_sourcefile -$(eval $(call gb_JavaClassSet_get_target,$(1)) : \ - $(call gb_JavaClassSet__get_sourcefile,$(2))) +$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2)) + endef define gb_JavaClassSet_add_sourcefiles @@ -79,42 +80,48 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil endef define gb_JavaClassSet_set_classpath -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2) endef # problem: currently we can't get these dependencies to work # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_add_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : $(2) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) + endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) + endef define gb_JavaClassSet_add_jars $(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar))) + endef define gb_JavaClassSet_add_system_jars $(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar))) + endef # this forwards to functions that must be defined in RepositoryExternal.mk. -# $(call gb_LinkTarget_use_external,library,external) +# $(eval $(call gb_LinkTarget_use_external,library,external)) define gb_JavaClassSet_use_external -$(eval $(if $(value gb_JavaClassSet__use_$(2)),\ +$(if $(value gb_JavaClassSet__use_$(2)),\ $(call gb_JavaClassSet__use_$(2),$(1)),\ - $(error gb_JavaClassSet_use_external: unknown external: $(2)))) + $(error gb_JavaClassSet_use_external: unknown external: $(2))) + endef define gb_JavaClassSet_use_externals $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) + endef # vim: set noet sw=4: |