BaseTools: strip trailing whitespace

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
index 37bcce519c7ec53533577190f52d29f1e805b9b4..df4eb64ea95ec0ac51839b936c59a5c6a5156107 100644 (file)
--- a/BaseTools/Source/C/GNUmakefile
+++ b/BaseTools/Source/C/GNUmakefile
@@ -77,7 +77,7 @@ $(SUBDIRS):
 $(patsubst %,%-clean,$(sort $(SUBDIRS))):\r
        -$(MAKE) -C $(@:-clean=) clean\r
 \r
-$(VFRAUTOGEN): VfrCompile/VfrSyntax.g \r
+$(VFRAUTOGEN): VfrCompile/VfrSyntax.g\r
        $(MAKE) -C VfrCompile VfrLexer.h\r
 \r
 clean:  $(patsubst %,%-clean,$(sort $(SUBDIRS)))\r

diff --git a/BaseTools/Source/C/Makefiles/app.makefile b/BaseTools/Source/C/Makefiles/app.makefile
index fcadb4ed2194c620d54fc43d589864d3a16a3008..6a2a8f5e8a0eae8dc9539a4bce8b312e7faa5109 100644 (file)
--- a/BaseTools/Source/C/Makefiles/app.makefile
+++ b/BaseTools/Source/C/Makefiles/app.makefile
@@ -12,9 +12,9 @@ include $(MAKEROOT)/Makefiles/header.makefile
 APPLICATION = $(MAKEROOT)/bin/$(APPNAME)\r
 \r
 .PHONY:all\r
-all: $(MAKEROOT)/bin $(APPLICATION) \r
+all: $(MAKEROOT)/bin $(APPLICATION)\r
 \r
-$(APPLICATION): $(OBJECTS) \r
+$(APPLICATION): $(OBJECTS)\r
        $(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)\r
 \r
 $(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h\r

diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
index e823246cfbb4cc654a37a270588e1e7767f0d39b..85c3374224f272668f2114def1c20a66590f36d8 100644 (file)
--- a/BaseTools/Source/C/Makefiles/footer.makefile
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
@@ -14,10 +14,10 @@ $(MAKEROOT)/libs-$(HOST_ARCH):
 install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)\r
        cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)\r
 \r
-$(LIBRARY): $(OBJECTS) \r
+$(LIBRARY): $(OBJECTS)\r
        $(BUILD_AR) crs $@ $^\r
 \r
-%.o : %.c \r
+%.o : %.c\r
        $(BUILD_CC)  -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@\r
 \r
 %.o : %.cpp\r

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 52cbffcb4423e316c21bde8d2c5fe09512a83df3..4e9b36d98bdb4dc5fd26fba637090d2c277bf1b8 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -61,7 +61,7 @@ else
 $(error Bad HOST_ARCH)\r
 endif\r
 \r
-INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) \r
+INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)\r
 BUILD_CPPFLAGS = $(INCLUDE)\r
 \r
 # keep EXTRA_OPTFLAGS last\r
@@ -82,7 +82,7 @@ BUILD_CXXFLAGS = -Wno-unused-result
 \r
 ifeq ($(HOST_ARCH), IA32)\r
 #\r
-# Snow Leopard  is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults \r
+# Snow Leopard  is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults\r
 #  to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard\r
 #  so only do this is uname -m returns i386.\r
 #\r
@@ -96,7 +96,7 @@ endif
 # keep BUILD_OPTFLAGS last\r
 BUILD_CFLAGS   += $(BUILD_OPTFLAGS)\r
 BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)\r
-  \r
+\r
 # keep EXTRA_LDFLAGS last\r
 BUILD_LFLAGS += $(EXTRA_LDFLAGS)\r
 \r
@@ -107,7 +107,7 @@ BUILD_LFLAGS += $(EXTRA_LDFLAGS)
 all:\r
 \r
 $(MAKEROOT)/libs:\r
-       mkdir $(MAKEROOT)/libs \r
+       mkdir $(MAKEROOT)/libs\r
 \r
 $(MAKEROOT)/bin:\r
        mkdir $(MAKEROOT)/bin\r

diff --git a/BaseTools/Source/C/Makefiles/lib.makefile b/BaseTools/Source/C/Makefiles/lib.makefile
index a9965fc628d97fe5a5712ef27a50b284460621dd..2577c15380a98bf735eb01194aee5e82c63379e7 100644 (file)
--- a/BaseTools/Source/C/Makefiles/lib.makefile
+++ b/BaseTools/Source/C/Makefiles/lib.makefile
@@ -9,6 +9,6 @@ include $(MAKEROOT)/Makefiles/header.makefile
 \r
 LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a\r
 \r
-all: $(MAKEROOT)/libs $(LIBRARY) \r
+all: $(MAKEROOT)/libs $(LIBRARY)\r
 \r
 include $(MAKEROOT)/Makefiles/footer.makefile\r

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index 75c9bb43a32ca920c5817801ca6a2612ad6394f4..f5f77fdc0bc57fd6eafb162038dca05f110ea9d3 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -57,6 +57,6 @@ LINKER = $(LD)
 \r
 INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)\r
 \r
-CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
+CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index 8b94c73bbefa1338ba778dacc4e82960ca7cab62..42e3d7da020f6af08c9c160a0704dc99d3f91d7d 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -36,9 +36,9 @@ include $(MAKEROOT)/Makefiles/header.makefile
 APPLICATION = $(MAKEROOT)/bin/$(APPNAME)\r
 \r
 .PHONY:all\r
-all: $(MAKEROOT)/bin $(APPLICATION) \r
+all: $(MAKEROOT)/bin $(APPLICATION)\r
 \r
-$(APPLICATION): $(OBJECTS) \r
+$(APPLICATION): $(OBJECTS)\r
        $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)\r
 \r
 VfrCompiler.o: ../Include/Common/BuildVersion.h\r
@@ -68,7 +68,7 @@ AParser.o: Pccts/h/AParser.cpp
 \r
 VfrSyntax.o: VfrSyntax.cpp\r
        $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@\r
-       \r
+\r
 clean: localClean\r
 \r
 localClean:\r

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index 218081860993e68b063f5fc7674fbb5cc430a956..b68cecddfd486a546eee083a550274aaf020624a 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -265,7 +265,7 @@ class Check(object):
         self.FunctionLayoutCheckBody()\r
         self.FunctionLayoutCheckLocalVariable()\r
         self.FunctionLayoutCheckDeprecated()\r
-    \r
+\r
     # To check if the deprecated functions are used\r
     def FunctionLayoutCheckDeprecated(self):\r
         if EccGlobalData.gConfig.CFunctionLayoutCheckNoDeprecated == '1' or EccGlobalData.gConfig.CFunctionLayoutCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 4d8b2bdee2991907c16f20e5c94eab8be759ae45..b2f3f6a1127ab0c02e781d0ccdaa5b355c8e4c14 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -160,7 +160,7 @@ class GenFdsGlobalVariable:
         "OUTPUT_DIR":os.path.join(BuildDir, "OUTPUT"),\r
         "DEBUG_DIR":os.path.join(BuildDir, "DEBUG")\r
         }\r
-        \r
+\r
         BuildRules = {}\r
         for Type in BuildRuleDatabase.FileTypeList:\r
             #first try getting build rule by BuildRuleFamily\r

diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile
index 0361c5330cfe66b21f3b41910b342a1f774c78f8..6c3bedbadf3a7da2d17f89c6b50647f91d3eba55 100644 (file)
--- a/BaseTools/Source/Python/Makefile
+++ b/BaseTools/Source/Python/Makefile
@@ -8,6 +8,6 @@
 all:\r
 \r
 clean:\r
-cleanall:  \r
+cleanall:\r
   @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc\r
 \r