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/CustomTarget_generated.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/CustomTarget_generated.mk')
| -rw-r--r-- | sal/CustomTarget_generated.mk | 22 |
1 files changed, 11 insertions, 11 deletions
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_' >> $@ |