summaryrefslogtreecommitdiff
path: root/util/cbfstool/Makefile.inc
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-10-30 14:02:45 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-12 18:35:52 +0100
commit2e200cde9a58a64f3df5f1c69dcdd57ef9452c3d (patch)
tree919607fc52473fbb54d587c2c4102f58328f13f2 /util/cbfstool/Makefile.inc
parenta5b70676385d6b5da3d18f81042de4a1bb4cf0da (diff)
downloadcoreboot-2e200cde9a58a64f3df5f1c69dcdd57ef9452c3d.tar.xz
cbfstool: Update LZMA encoder to LZMA SDK 9.12
This removes almost all C++ code (except the wrapper) Change-Id: I0f84070e3b6dc57c98d49a53150a140479b3221f Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1799 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'util/cbfstool/Makefile.inc')
-rw-r--r--util/cbfstool/Makefile.inc39
1 files changed, 10 insertions, 29 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index f9aef2e795..bb2fe35bd4 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -1,19 +1,16 @@
cbfsobj :=
+cbfsobj += cbfstool.o
cbfsobj += common.o
cbfsobj += compress.o
-cbfsobj += minilzma.o
-cbfsobj += LZMAEncoder.o
-cbfsobj += LZInWindow.o
-cbfsobj += RangeCoderBit.o
-cbfsobj += StreamUtils.o
-cbfsobj += OutBuffer.o
-cbfsobj += Alloc.o
-cbfsobj += CRC.o
cbfsobj += cbfs-mkstage.o
cbfsobj += cbfs-mkpayload.o
-cbfsobj += cbfstool.o
+# LZMA
+cbfsobj += lzma.o
+cbfsobj += LzFind.o
+cbfsobj += LzmaDec.o
+cbfsobj += LzmaEnc.o
-CBFSTOOLFLAGS=-DCOMPACT -g
+CBFSTOOLFLAGS=-D_7ZIP_ST -g
ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
CBFSTOOLFLAGS+=-mno-ms-bitfields
@@ -30,25 +27,9 @@ $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc
printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
-$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp
- printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
- $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
-
-$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp
- printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
- $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
-
-$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp
- printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
- $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
-
-$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp
- printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
- $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
-
-$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp
- printf " HOSTCXX $(subst $(objutil)/,,$(@))\n"
- $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
+$(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/%.c
+ printf " HOSTCC $(subst $(objutil)/,,$(@))\n"
+ $(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
$(objutil)/cbfstool/cbfstool: $(objutil)/cbfstool $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
printf " HOSTCXX $(subst $(objutil)/,,$(@)) (link)\n"