diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
| commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
| tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /ridljar | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'ridljar')
| -rw-r--r-- | ridljar/CustomTarget_javamaker.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index d0436f834b13..d9b3a7b4249c 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/ridljar/CustomTarget_javamaker.mk @@ -27,14 +27,15 @@ $(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker)) -RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker) +ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker) -$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done +$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done -$(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \ - $(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir +$(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) \ + | $(ridljar_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ - $(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@) + $(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR)/class $<) && touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |