diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-05 16:04:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-05 16:13:22 +0200 |
| commit | 71dbf5bfd0b9622ad485a5b7620e11d8405ed474 (patch) | |
| tree | 36388f3320edfc32c4911054779c1c8c00c0d739 /testtools/CustomTarget_bridgetest_javamaker.mk | |
| parent | 9dc26ca9461dbb539c523c8bd68ce171aab25d90 (diff) | |
normalize gbuild variable names in testtools.
Variables should have module name as prefix to prevent collisions.
Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524
Diffstat (limited to 'testtools/CustomTarget_bridgetest_javamaker.mk')
| -rw-r--r-- | testtools/CustomTarget_bridgetest_javamaker.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index 593cf169ea17..e509e0453360 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -26,14 +26,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker)) -javamaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker) +testtools_JAVADIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker) -$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(javamaker_DIR)/done +$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_JAVADIR)/done -$(javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \ - $(call gb_Executable_get_target_for_build,javamaker) | $(javamaker_DIR)/.dir +$(testtools_JAVADIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \ + $(call gb_Executable_get_target_for_build,javamaker) | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ - $(call gb_Helper_execute,javamaker -BUCR -nD -O$(javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@) + $(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |