cbfstool: Replace C++ code with C code
cbfstool was using a C++ wrapper around the C written LZMA functions.
And a C wrapper around those C++ functions. Drop the mess and rewrite
the functions to be all C.
Change-Id: Ieb6645a42f19efcc857be323ed8bdfcd9f48ee7c
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/3010
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index a51e6de..a0de08d 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -1,6 +1,5 @@
obj ?= $(shell pwd)
-HOSTCXX ?= g++
HOSTCC ?= gcc
CFLAGS ?= -g -Wall -Werror
CFLAGS += -D_7ZIP_ST
@@ -20,9 +19,6 @@
$(obj)/%.o: %.c
$(HOSTCC) $(CFLAGS) -c -o $@ $<
-$(obj)/%.o: %.cc
- $(HOSTCXX) $(CFLAGS) -c -o $@ $<
-
clean:
rm -f $(COMMON) $(BINARY)
@@ -30,11 +26,11 @@
ctags *.[ch]
$(obj)/cbfstool:$(COMMON)
- $(HOSTCXX) $(CFLAGS) -o $@ $^
+ $(HOSTCC) $(CFLAGS) -o $@ $^
dep:
@$(HOSTCC) $(CFLAGS) -MM *.c > .dependencies
- @$(HOSTCC) $(CFLAGS) -MM lzma/*.cc >> .dependencies
+ @$(HOSTCC) $(CFLAGS) -MM lzma/*.c >> .dependencies
@$(HOSTCC) $(CFLAGS) -MM lzma/C/*.c >> .dependencies
-include .dependencies