Sync EDKII BaseTools to BaseTools project r2042.

[mirror_edk2.git] / BaseTools / Source / C / Makefiles / header.makefile

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 96b3d15e8ae2031ef8ef814ffb4bb4fcd8a42bb6..841803e51d54c88f196c13511fbb91b302101ac6 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -1,10 +1,10 @@
 ## @file\r
 #\r
-# The makefile can be invoked with\r
-# ARCH = x86_64 or x64 for EM64T build\r
-# ARCH = ia32 or IA32 for IA32 build\r
-# ARCH = ia64 or IA64 for IA64 build\r
-#\r
+# The makefile can be invoked with
+# ARCH = x86_64 or x64 for EM64T build
+# ARCH = ia32 or IA32 for IA32 build
+# ARCH = ia64 or IA64 for IA64 build
+#
 # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -12,55 +12,52 @@
 # http://opensource.org/licenses/bsd-license.php\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-ARCH ?= IA32\r
-\r
-CYGWIN:=$(findstring CYGWIN, $(shell uname -s))\r
-LINUX:=$(findstring Linux, $(shell uname -s))\r
-DARWIN:=$(findstring Darwin, $(shell uname -s))\r
-\r
-CC = gcc\r
-CXX = g++\r
-AS = gcc\r
-AR = ar\r
-LD = ld\r
-LINKER ?= $(CC)\r
-ifeq ($(ARCH), IA32)\r
-ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/\r
-endif\r
-\r
-ifeq ($(ARCH), X64)\r
-ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/\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
-CPPFLAGS = $(INCLUDE)\r
-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fno-merge-constants -nostdlib -Wall -Werror -c -g\r
-LFLAGS =\r
-\r
-#\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\r
-#\r
-uname_s = $(shell uname -s)\r
-uname_m = $(shell uname -m)\r
-ifeq ($(uname_s),Darwin)\r
-ifeq ($(uname_m),i386)\r
-  CFLAGS   += -arch i386\r
-  CPPFLAGS += -arch i386\r
-  LFLAGS   += -arch i386\r
-endif\r
-endif\r
-  \r
-.PHONY: all\r
-.PHONY: install\r
-.PHONY: clean\r
-\r
-all:\r
-\r
-$(MAKEROOT)/libs:\r
-       mkdir $(MAKEROOT)/libs \r
-\r
-$(MAKEROOT)/bin:\r
-       mkdir $(MAKEROOT)/bin\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ARCH ?= IA32
+
+CYGWIN:=$(findstring CYGWIN, $(shell uname -s))
+LINUX:=$(findstring Linux, $(shell uname -s))
+DARWIN:=$(findstring Darwin, $(shell uname -s))
+
+CC = gcc
+CXX = g++
+AS = gcc
+AR = ar
+LD = ld
+LINKER ?= $(CC)
+ifeq ($(ARCH), IA32)
+ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/
+endif
+
+ifeq ($(ARCH), X64)
+ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/
+endif
+
+INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) 
+CPPFLAGS = $(INCLUDE)
+CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fno-merge-constants -nostdlib -Wall -Werror -c -g
+LFLAGS =
+
+#
+# Snow Leopard  is a 32-bit and 64-bit environment. uname -m returns -i386, but gcc defaults 
+#  to x86_64. So make sure tools match uname -m
+#
+uname_s = $(shell uname -s)
+ifeq ($(uname_s),Darwin)
+  CFLAGS   += -arch i386
+  CPPFLAGS += -arch i386
+  LFLAGS   += -arch i386
+endif
+  
+.PHONY: all
+.PHONY: install
+.PHONY: clean
+
+all:
+
+$(MAKEROOT)/libs:
+       mkdir $(MAKEROOT)/libs 
+
+$(MAKEROOT)/bin:
+       mkdir $(MAKEROOT)/bin