Ported r864 to gnu toolchain.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@865 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/Common/GNUmakefile b/Source/C/Common/GNUmakefile
index 4a49d48..7776b01 100644 (file)
--- a/Source/C/Common/GNUmakefile
+++ b/Source/C/Common/GNUmakefile
@@ -7,4 +7,4 @@ LIBNAME = Common
 
 OBJECTS = CommonLib.o Decompress.o EfiUtilityMsgs.o MyAlloc.o SimpleFileParsing.o Crc32.o EfiCompress.o FvLib.o ParseInf.o TianoCompress.o PeCoffLoaderEx.o BasePeCoff.o
 
-include $(MAKEROOT)/lib.makefile
+include $(MAKEROOT)/Makefiles/lib.makefile

diff --git a/Source/C/EfiLdrImage/GNUmakefile b/Source/C/EfiLdrImage/GNUmakefile
index 7263ac4..3bf3d04 100644 (file)
--- a/Source/C/EfiLdrImage/GNUmakefile
+++ b/Source/C/EfiLdrImage/GNUmakefile
@@ -7,4 +7,4 @@ LIBS = -lCommon
 
 OBJECTS = EfiLdrImage.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile

diff --git a/Source/C/EfiRom/GNUmakefile b/Source/C/EfiRom/GNUmakefile
index 698141a..9392a6f 100644 (file)
--- a/Source/C/EfiRom/GNUmakefile
+++ b/Source/C/EfiRom/GNUmakefile
@@ -7,4 +7,4 @@ LIBS = -lCommon
 
 OBJECTS = EfiRom.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile

diff --git a/Source/C/GNUmakefile b/Source/C/GNUmakefile
index cbc5f22..2b69919 100644 (file)
--- a/Source/C/GNUmakefile
+++ b/Source/C/GNUmakefile
@@ -1,7 +1,7 @@
 ARCH ?= IA32
 MAKEROOT = .
 
-include header.makefile
+include Makefiles/header.makefile
 
 all: makerootdir subdirs $(MAKEROOT)/libs
 
@@ -32,4 +32,4 @@ localClean:
        rm -f $(MAKEROOT)/bin/*
        -rmdir $(MAKEROOT)/libs $(MAKEROOT)/bin
 
-include footer.makefile
+include Makefiles/footer.makefile

diff --git a/Source/C/GenFfs/GNUmakefile b/Source/C/GenFfs/GNUmakefile
index 239c473..df431b4 100644 (file)
--- a/Source/C/GenFfs/GNUmakefile
+++ b/Source/C/GenFfs/GNUmakefile
@@ -5,7 +5,7 @@ APPNAME = GenFfs
 
 OBJECTS = GenFfs.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 LIBS = -lCommon
 

diff --git a/Source/C/GenFv/GNUmakefile b/Source/C/GenFv/GNUmakefile
index e2cf91d..10b8d5c 100644 (file)
--- a/Source/C/GenFv/GNUmakefile
+++ b/Source/C/GenFv/GNUmakefile
@@ -5,7 +5,7 @@ APPNAME = GenFvImage
 
 OBJECTS = GenFv.o GenFvInternalLib.o GenFvPadFileTable.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 LIBS = -lCommon
 ifeq ($(CYGWIN), CYGWIN)

diff --git a/Source/C/GenFw/GNUmakefile b/Source/C/GenFw/GNUmakefile
index 796baf5..decae9e 100644 (file)
--- a/Source/C/GenFw/GNUmakefile
+++ b/Source/C/GenFw/GNUmakefile
@@ -5,7 +5,7 @@ APPNAME = GenFw
 
 OBJECTS = GenFw.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 LIBS = -lCommon
 ifeq ($(CYGWIN), CYGWIN)

diff --git a/Source/C/GenPage/GNUmakefile b/Source/C/GenPage/GNUmakefile
index e6ef415..a828168 100644 (file)
--- a/Source/C/GenPage/GNUmakefile
+++ b/Source/C/GenPage/GNUmakefile
@@ -7,4 +7,4 @@ LIBS = -lCommon
 
 OBJECTS = GenPage.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile

diff --git a/Source/C/GenSec/GNUmakefile b/Source/C/GenSec/GNUmakefile
index 27ec2cf..a3bed5d 100644 (file)
--- a/Source/C/GenSec/GNUmakefile
+++ b/Source/C/GenSec/GNUmakefile
@@ -5,7 +5,7 @@ APPNAME = GenSec
 
 OBJECTS = GenSec.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 LIBS = -lCommon
 ifeq ($(CYGWIN), CYGWIN)

diff --git a/Source/C/GenVtf/GNUmakefile b/Source/C/GenVtf/GNUmakefile
index 9219e66..2449bb8 100644 (file)
--- a/Source/C/GenVtf/GNUmakefile
+++ b/Source/C/GenVtf/GNUmakefile
@@ -7,4 +7,4 @@ LIBS = -lCommon
 
 OBJECTS = GenVtf.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile

diff --git a/Source/C/Makefiles/app.makefile b/Source/C/Makefiles/app.makefile
index 6e316c4..fe23b3a 100644 (file)
--- a/Source/C/Makefiles/app.makefile
+++ b/Source/C/Makefiles/app.makefile
@@ -1,6 +1,6 @@
 MAKEROOT ?= ../..
 
-include $(MAKEROOT)/header.makefile
+include $(MAKEROOT)/Makefiles/header.makefile
 
 APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
 
@@ -10,4 +10,4 @@ all: $(MAKEROOT)/bin $(APPLICATION)
 $(APPLICATION): $(OBJECTS) 
        $(LINKER) -out:$(APPLICATION) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
 
-include $(MAKEROOT)/footer.makefile
+include $(MAKEROOT)/Makefiles/footer.makefile

diff --git a/Source/C/Makefiles/lib.makefile b/Source/C/Makefiles/lib.makefile
index a4de2a5..2b1a9d4 100644 (file)
--- a/Source/C/Makefiles/lib.makefile
+++ b/Source/C/Makefiles/lib.makefile
@@ -1,7 +1,7 @@
-include $(MAKEROOT)/header.makefile
+include $(MAKEROOT)/Makefiles/header.makefile
 
 LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a
 
 all: $(MAKEROOT)/libs $(LIBRARY) 
 
-include $(MAKEROOT)/footer.makefile
+include $(MAKEROOT)/Makefiles/footer.makefile

diff --git a/Source/C/Split/GNUmakefile b/Source/C/Split/GNUmakefile
index a7ff20a..45cf419 100644 (file)
--- a/Source/C/Split/GNUmakefile
+++ b/Source/C/Split/GNUmakefile
@@ -5,7 +5,7 @@ APPNAME = Split
 
 OBJECTS = Split.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 LIBS = -lCommon
 

diff --git a/Source/C/TianoCompress/GNUmakefile b/Source/C/TianoCompress/GNUmakefile
index 5fb88f3..151bbe2 100644 (file)
--- a/Source/C/TianoCompress/GNUmakefile
+++ b/Source/C/TianoCompress/GNUmakefile
@@ -7,4 +7,4 @@ LIBS = -lCommon
 
 OBJECTS = TianoCompress.o
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile

diff --git a/Source/C/VfrCompile/GNUmakefile b/Source/C/VfrCompile/GNUmakefile
index c9e511d..eee57d5 100644 (file)
--- a/Source/C/VfrCompile/GNUmakefile
+++ b/Source/C/VfrCompile/GNUmakefile
@@ -14,7 +14,7 @@ LINKER = $(CXX)
 
 EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp parser.dlg EfiVfrParser.h DLGLexer.cpp VfrCompile.cpp tokens.h DLGLexer.h
 
-include $(MAKEROOT)/app.makefile
+include $(MAKEROOT)/Makefiles/app.makefile
 
 VfrCompile.cpp DLGLexer.cpp EfiVfrParser.cpp: Pccts/antlr/antlr Pccts/dlg/dlg VfrCompile.g
        Pccts/antlr/antlr -CC -e3 -ck 3 -o . VfrCompile.g