diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-22 15:53:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-23 13:20:28 +0200 |
| commit | c1a1d5d532626c89d19e960a2c4be0a439359e11 (patch) | |
| tree | e8748c3bad6282eed2568d87057231886c036434 /solenv/gbuild/JavaClassSet.mk | |
| parent | f4f4d9d29e098b64878301b544863ca6e2bbef26 (diff) | |
do not use gb_Helper_REPOSITORYNAMES anymore
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 458216b62a49..292d7aee1ddb 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,6 @@ # #************************************************************************* -gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) gb_JavaClassSet_JAVACDEBUG := @@ -64,20 +63,16 @@ $(call gb_JavaClassSet_get_clean_target,%) : # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar) # UGLY: cannot use target local variable for REPO because it's needed in prereq define gb_JavaClassSet_JavaClassSet -$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\ - $(error JavaClassSet: no or invalid repository given; known repositories: \ - $(gb_JavaClassSet_REPOSITORYNAMES))) -gb_JavaClassSet_REPO_$(1) := $(2) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := endef define gb_JavaClassSet__get_sourcefile -$($(1))/$(2).java +$(SRCDIR)/$(1).java endef define gb_JavaClassSet_add_sourcefile $(eval $(call gb_JavaClassSet_get_target,$(1)) : \ - $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2))) + $(call gb_JavaClassSet__get_sourcefile,$(2))) endef define gb_JavaClassSet_add_sourcefiles |