From d32b27383b35b62ea853e5edda5af302898c9cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Fri, 15 May 2015 09:27:34 +0300
Subject: [PATCH] cbfstool: Rename autogenerated targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These names will skip the lint-whitespace tests.

Change-Id: If4ac1f8e11fd0ac62f09696f2704477b6eb30046
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10212
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 util/cbfstool/Makefile.inc                    | 31 +++++++++++++------
 .../{fmd_parser.c => fmd_parser.c_shipped}    |  0
 .../{fmd_parser.h => fmd_parser.h_shipped}    |  0
 .../{fmd_scanner.c => fmd_scanner.c_shipped}  |  0
 .../{fmd_scanner.h => fmd_scanner.h_shipped}  |  0
 5 files changed, 21 insertions(+), 10 deletions(-)
 rename util/cbfstool/{fmd_parser.c => fmd_parser.c_shipped} (100%)
 rename util/cbfstool/{fmd_parser.h => fmd_parser.h_shipped} (100%)
 rename util/cbfstool/{fmd_scanner.c => fmd_scanner.c_shipped} (100%)
 rename util/cbfstool/{fmd_scanner.h => fmd_scanner.h_shipped} (100%)

diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 52c3e42c00..84ab724757 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -90,20 +90,31 @@ $(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_parser.o: $(objutil)/cbfstool/fmd.o
+$(objutil)/cbfstool/fmd_scanner.o: $(objutil)/cbfstool/fmd.o
+
+$(top)/util/cbfstool/%: $(top)/util/cbfstool/%_shipped
+	mkdir -p $(dir $@)
+	cp $< $@
+
 ifeq ($(CONFIG_FMD_GENPARSER),y)
 TOOLLEX := lex
 TOOLYACC := yacc
 
-$(objutil)/cbfstool/fmd.o: $(top)/util/cbfstool/fmd_parser.c
-$(objutil)/cbfstool/fmd.o: $(top)/util/cbfstool/fmd_scanner.c
-$(objutil)/cbfstool/fmd_parser.o: $(objutil)/cbfstool/fmd.o
-$(objutil)/cbfstool/fmd_scanner.o: $(objutil)/cbfstool/fmd.o
-$(top)/util/cbfstool/fmd_scanner.c $(top)/util/cbfstool/fmd_scanner.h: $(top)/util/cbfstool/fmd_scanner.l
+# the .c rule also creates .h
+$(top)/util/cbfstool/fmd_scanner.h_shipped: $(top)/util/cbfstool/fmd_scanner.c_shipped
+$(top)/util/cbfstool/fmd_scanner.c_shipped: $(top)/util/cbfstool/fmd_scanner.l
 	echo "    LEX        util/cbfstool/fmd_scanner.[ch]"
-	$(TOOLLEX) -t --header-file=$(top)/util/cbfstool/fmd_scanner.h $< >$(top)/util/cbfstool/fmd_scanner.c
-$(top)/util/cbfstool/fmd_parser.c $(top)/util/cbfstool/fmd_parser.h: $(top)/util/cbfstool/fmd_parser.y
+	$(TOOLLEX) -t --header-file=$(top)/util/cbfstool/fmd_scanner.h_shipped $< >$(top)/util/cbfstool/fmd_scanner.c_shipped
+
+# the .c rule also creates .h
+$(top)/util/cbfstool/fmd_parser.h_shipped: $(top)/util/cbfstool/fmd_parser.c_shipped
+$(top)/util/cbfstool/fmd_parser.c_shipped: $(top)/util/cbfstool/fmd_parser.y
 	echo "    YACC       util/cbfstool/fmd_parser.[ch]"
 	$(TOOLYACC) -d $<
-	mv -f y.tab.c $(top)/util/cbfstool/fmd_parser.c
-	mv -f y.tab.h $(top)/util/cbfstool/fmd_parser.h
-endif
+	mv -f y.tab.c $(top)/util/cbfstool/fmd_parser.c_shipped
+	mv -f y.tab.h $(top)/util/cbfstool/fmd_parser.h_shipped
+
+endif # CONFIG_FMD_GENPARSER
diff --git a/util/cbfstool/fmd_parser.c b/util/cbfstool/fmd_parser.c_shipped
similarity index 100%
rename from util/cbfstool/fmd_parser.c
rename to util/cbfstool/fmd_parser.c_shipped
diff --git a/util/cbfstool/fmd_parser.h b/util/cbfstool/fmd_parser.h_shipped
similarity index 100%
rename from util/cbfstool/fmd_parser.h
rename to util/cbfstool/fmd_parser.h_shipped
diff --git a/util/cbfstool/fmd_scanner.c b/util/cbfstool/fmd_scanner.c_shipped
similarity index 100%
rename from util/cbfstool/fmd_scanner.c
rename to util/cbfstool/fmd_scanner.c_shipped
diff --git a/util/cbfstool/fmd_scanner.h b/util/cbfstool/fmd_scanner.h_shipped
similarity index 100%
rename from util/cbfstool/fmd_scanner.h
rename to util/cbfstool/fmd_scanner.h_shipped