diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-06-30 15:17:49 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-06-30 15:17:49 +0000 |
| commit | 0867062412dd4bfe5a556e5f3fd85ba5b682d79b (patch) | |
| tree | 81ca5db12b8567b48daaa23a541bfb8a5dc011f8 /util/cbfstool | |
| parent | 9702b6bf7ec5a4fb16934f1cf2724480e2460c89 (diff) | |
| download | coreboot-0867062412dd4bfe5a556e5f3fd85ba5b682d79b.tar.xz | |
This patch unifies the use of config options in v2 to all start with CONFIG_
It's basically done with the following script and some manual fixup:
VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC`
for VAR in $VARS; do
find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \;
done
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/cbfstool')
| -rw-r--r-- | util/cbfstool/Makefile | 6 | ||||
| -rw-r--r-- | util/cbfstool/tools/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 50f97961bc..7dc83fd2e4 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -8,7 +8,7 @@ COMMANDS=create.o bootblock.o delete.o extract.o add.o print.o resize.o OBJ=$(COMMANDS) cbfstool.o util.o fs.o INC=cbfstool.h cbfs.h -HOSTCC ?= gcc +CONFIG_HOSTCC ?= gcc HOSTCXX ?= g++ CFLAGS=-g -Wall -W -Werror @@ -18,7 +18,7 @@ DESTDIR ?= /usr/local/bin all: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage $(obj)/cbfstool: $(patsubst %,$(obj)/%,$(OBJ)) - $(HOSTCC) -o $@ $(patsubst %,$(obj)/%,$(OBJ)) + $(CONFIG_HOSTCC) -o $@ $(patsubst %,$(obj)/%,$(OBJ)) tobj = $(obj)/tools tsrc = $(shell pwd)/tools @@ -26,7 +26,7 @@ tsrc = $(shell pwd)/tools include $(tsrc)/Makefile $(obj)/%.o: %.c $(INC) - $(HOSTCC) $(CFLAGS) -c -o $@ $< + $(CONFIG_HOSTCC) $(CFLAGS) -c -o $@ $< install: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage @ install -d $(DESTDIR) diff --git a/util/cbfstool/tools/Makefile b/util/cbfstool/tools/Makefile index e750c21bd7..3bb8f5dff5 100644 --- a/util/cbfstool/tools/Makefile +++ b/util/cbfstool/tools/Makefile @@ -18,7 +18,7 @@ $(tobj)/cbfs-mkpayload: $(tobj)/cbfs-mkpayload.o $(patsubst %,$(tobj)/%,$(COMMON $(HOSTCXX) $(CFLAGS) -o $@ $^ $(tobj)/%.o: %.c - $(HOSTCC) $(CFLAGS) -c -o $@ $< + $(CONFIG_HOSTCC) $(CFLAGS) -c -o $@ $< tools-clean: rm -f $(tobj)/cbfs-mkpayload.o $(tobj)/cbfs-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON)) |