[coreboot-gerrit] New patch to review for coreboot: 0275185 cbfstool: Copy generated files to the build hierarchy before use

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10252

-gerrit

commit 02751852e67632644297d460c35234a8677344c7
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Tue May 19 16:43:05 2015 +0200

    cbfstool: Copy generated files to the build hierarchy before use
    
    Instead of writing to the source tree (which we should generally avoid),
    copy the pre-generated files (from lex and yacc) to $(objutil). Adapt
    include paths and rules so they're found.
    
    Change-Id: Id33be6d1dccf9a1b5857a29c55120dcc8f8db583
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 util/cbfstool/Makefile.inc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 84ab724..dde8c68 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -47,12 +47,18 @@ TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
 TOOLCPPFLAGS ?= -D_DEFAULT_SOURCE # memccpy() from string.h
 TOOLCPPFLAGS += -D_POSIX_C_SOURCE=200809L # strdup() from string.h
 TOOLCPPFLAGS += -I$(top)/util/cbfstool/flashmap
+TOOLCPPFLAGS += -I$(top)/util/cbfstool
+TOOLCPPFLAGS += -I$(objutil)/cbfstool
 TOOLLDFLAGS ?=
 
 ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
 TOOLFLAGS+=-mno-ms-bitfields
 endif
 
+$(objutil)/cbfstool/%.o: $(objutil)/cbfstool/%.c
+	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
+	$(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
+
 $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/%.c
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
 	$(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
@@ -90,12 +96,12 @@ $(objutil)/cbfstool/fmd_scanner.o: TOOLCFLAGS += -Wno-unused-function
 # Tolerate lzma sdk warnings
 $(objutil)/cbfstool/LzmaEnc.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual
 
-$(objutil)/cbfstool/fmd.o: $(top)/util/cbfstool/fmd_parser.h
-$(objutil)/cbfstool/fmd.o: $(top)/util/cbfstool/fmd_scanner.h
+$(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_parser.h
+$(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_scanner.h
 $(objutil)/cbfstool/fmd_parser.o: $(objutil)/cbfstool/fmd.o
 $(objutil)/cbfstool/fmd_scanner.o: $(objutil)/cbfstool/fmd.o
 
-$(top)/util/cbfstool/%: $(top)/util/cbfstool/%_shipped
+$(objutil)/cbfstool/%: $(top)/util/cbfstool/%_shipped
 	mkdir -p $(dir $@)
 	cp $< $@