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 /sal/Executable_osl_process_child.mk | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'sal/Executable_osl_process_child.mk')
| -rw-r--r-- | sal/Executable_osl_process_child.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index f3ce6a925ee5..90548762fb52 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -41,18 +41,20 @@ $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ # Also this batch file is required by sal_osl_process. # See qa/osl/process/osl_process.cxx:675 ifeq ($(OS),WNT) -BATCH_FILE:=batch.bat +sal_BATCH_FILE := batch.bat else -BATCH_FILE:=batch.sh +sal_BATCH_FILE := batch.sh endif -$(call gb_Executable_get_target,osl_process_child): $(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE) +$(call gb_Executable_get_target,osl_process_child) : \ + $(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE) -$(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE): $(SRCDIR)/sal/qa/osl/process/$(BATCH_FILE) +$(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE) : \ + $(SRCDIR)/sal/qa/osl/process/$(sal_BATCH_FILE) mkdir -p $(dir $@) && \ $(call gb_Deliver_deliver,$<,$@) -$(call gb_Executable_get_clean_target,osl_process_child): - rm -f $(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE) +$(call gb_Executable_get_clean_target,osl_process_child) : + rm -f $(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE) # vim: set noet sw=4 ts=4: |