diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-11 14:02:22 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 11:11:47 +0200 |
| commit | ed2ee34743f975225655576197cf6569bb138d71 (patch) | |
| tree | d6edb5a6dbcd2fa2e9a9641acaad80643bbde282 /solenv/gbuild/JavaClassSet.mk | |
| parent | 95e0b6adbffe4edcbc0de255c4c9e41d52ab81b4 (diff) | |
gnumake4: merge DEV300_m106 [hg:5102137bfe1e]
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index d3e8d5803cee..0aeaf149bf83 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -72,7 +72,7 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil endef define gb_JavaClassSet_set_classpath -$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)) endef @@ -80,7 +80,34 @@ endef # 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)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2)) $(eval $(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)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2)) +$(eval $(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) +define gb_JavaClassSet_use_external +$(eval $(if $(value gb_JavaClassSet__use_$(2)),\ + $(call gb_JavaClassSet__use_$(2),$(1)),\ + $(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 ts=4: |