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 /accessibility | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/CustomTarget_bridge.mk | 18 | ||||
| -rw-r--r-- | accessibility/CustomTarget_bridge_inc.mk | 7 |
2 files changed, 11 insertions, 14 deletions
diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk index 1d26e845050c..3127462e8373 100644 --- a/accessibility/CustomTarget_bridge.mk +++ b/accessibility/CustomTarget_bridge.mk @@ -27,26 +27,24 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge)) -ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge) - $(call gb_CustomTarget_get_target,accessibility/bridge) : \ - $(ACBR)/org/openoffice/java/accessibility/Build.java + $(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java ifeq ($(PRODUCT),) -ac_DEBUGSWITCH := true -ac_PRODUCTSWITCH := false +accessibility_DEBUG := true +accessibility_PRODUCT := false else -ac_DEBUGSWITCH := false -ac_PRODUCTSWITCH := true +accessibility_DEBUG := false +accessibility_PRODUCT := true endif -$(ACBR)/org/openoffice/java/accessibility/Build.java : +$(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) mkdir -p $(dir $@) && (\ echo package org.openoffice.java.accessibility\; && \ echo public class Build \{ && \ - echo public static final boolean DEBUG = $(ac_DEBUGSWITCH)\; && \ - echo public static final boolean PRODUCT = $(ac_PRODUCTSWITCH)\; && \ + echo public static final boolean DEBUG = $(accessibility_DEBUG)\; && \ + echo public static final boolean PRODUCT = $(accessibility_PRODUCT)\; && \ echo \} \ ) > $@ diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk index 282dd89dde4a..6ef223568a8c 100644 --- a/accessibility/CustomTarget_bridge_inc.mk +++ b/accessibility/CustomTarget_bridge_inc.mk @@ -27,12 +27,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc)) -ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc) - $(call gb_CustomTarget_get_target,accessibility/bridge/inc) : \ - $(ACBI)/WindowsAccessBridgeAdapter.h + $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/WindowsAccessBridgeAdapter.h -$(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \ +$(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/WindowsAccessBridgeAdapter.h :| \ + $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/.dir \ $(call gb_Jar_get_target,java_uno_accessbridge) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1) cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \ |