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 /unoil/CustomTarget_javamaker.mk | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'unoil/CustomTarget_javamaker.mk')
| -rw-r--r-- | unoil/CustomTarget_javamaker.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk index 94e70af7d813..5419f967b271 100644 --- a/unoil/CustomTarget_javamaker.mk +++ b/unoil/CustomTarget_javamaker.mk @@ -27,16 +27,17 @@ $(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker)) -UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker) +unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker) -$(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done +$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done -$(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ - $(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir +$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) \ + | $(unoil_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ - rm -r $(UIJM) && \ - $(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ + rm -r $(unoil_JAVADIR) && \ + $(call gb_Helper_execute,javamaker -BUCR -O$(unoil_JAVADIR) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |