From a9550f63cd7a7e064901b2c997375ed384781eea Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 9 May 2012 23:15:42 +0200
Subject: normalize variable names in gbuild user makefiles

Variables should have module name as prefix to prevent collisions.
---
 sal/CustomTarget_generated.mk       | 22 +++++++++++-----------
 sal/Executable_osl_process_child.mk | 14 ++++++++------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'sal')

diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index 1b0206272437..175780f9657b 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -27,28 +27,28 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,sal/generated))
 
-SAUT := $(call gb_CustomTarget_get_workdir,sal/generated)
+sal_DIR := $(call gb_CustomTarget_get_workdir,sal/generated)
 
 $(call gb_CustomTarget_get_target,sal/generated) : \
-	$(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \
-	$(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
+	$(sal_DIR)/rtlbootstrap.mk $(sal_DIR)/sal/udkversion.h \
+	$(if $(filter-out $(COM),MSC),$(sal_DIR)/sal/typesizes.h)
 
 # FIXME: rtlbootstrap.mk is empty on cygwin
 ifeq ($(COM),MSC)
-$(SAUT)/rtlbootstrap.mk :| $(SAUT)/.dir
+$(sal_DIR)/rtlbootstrap.mk :| $(sal_DIR)/.dir
 	touch $@
 else
-$(SAUT)/rtlbootstrap.mk : $(SAUT)/sal/typesizes.h | $(SAUT)/.dir
+$(sal_DIR)/rtlbootstrap.mk : $(sal_DIR)/sal/typesizes.h | $(sal_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \
-	$(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(SAUT) -I$(SRCDIR)/sal/rtl/source \
-		-I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \
+	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(sal_DIR)/bootstrap.cxx && \
+	$(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(sal_DIR) -I$(SRCDIR)/sal/rtl/source \
+		-I$(SRCDIR)/sal/inc $(sal_DIR)/bootstrap.cxx > $@.tmp && \
 	cat $@.tmp | grep '^RTL_' | sed -e 's/"//g' > $@ && \
-	rm $(SAUT)/bootstrap.cxx $@.tmp)
+	rm $(sal_DIR)/bootstrap.cxx $@.tmp)
 endif
 
-$(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir
+$(sal_DIR)/sal/typesizes.h :| $(sal_DIR)/sal/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '/* This file is autogenerated from configure script data */' > $@
 	echo >> $@
@@ -69,7 +69,7 @@ endif
 
 include $(SRCDIR)/solenv/inc/udkversion.mk
 
-$(SAUT)/sal/udkversion.h :| $(SAUT)/sal/.dir
+$(sal_DIR)/sal/udkversion.h :| $(sal_DIR)/sal/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
 	echo '#define _SAL_UDKVERSION_H_'           >> $@
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:
-- 
cgit