X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fcbfstool%2FMakefile;h=843e6775031f11e1eaafefd878a4811fcbec569f;hb=202be7b6b7e06597f672426af29649c92353db17;hp=7dc83fd2e425ed472c38dd6e60123ae0335420af;hpb=0867062412dd4bfe5a556e5f3fd85ba5b682d79b;p=coreboot.git

diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 7dc83fd2e..843e67750 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -1,42 +1,52 @@
-#
-#
-#
-
 obj ?= $(shell pwd)
 
-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
-
-CONFIG_HOSTCC ?= gcc
 HOSTCXX ?= g++
+HOSTCC ?= gcc
+CFLAGS ?= -g
+
+
+BINARY:=$(obj)/cbfstool
+
+COMMON:=common.o compress.o minilzma.o
+COMMON+=LZMAEncoder.o LZInWindow.o
+COMMON+=RangeCoderBit.o StreamUtils.o
+COMMON+=OutBuffer.o Alloc.o CRC.o
+COMMON+=cbfs-mkstage.o cbfs-mkpayload.o cbfstool.o
+
+COMMON:=$(addprefix $(obj)/,$(COMMON))
+
+$(obj)/%.o: %.c
+	$(HOSTCC) $(CFLAGS) -c -o $@ $<
 
-CFLAGS=-g -Wall -W -Werror
+$(obj)/%.o: lzma/%.cc
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-DESTDIR ?= /usr/local/bin
+$(obj)/%.o: lzma/C/7zip/Compress/LZMA/%.cpp
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-all: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
+$(obj)/%.o: lzma/C/7zip/Compress/LZ/%.cpp
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-$(obj)/cbfstool: $(patsubst %,$(obj)/%,$(OBJ))
-	$(CONFIG_HOSTCC) -o $@ $(patsubst %,$(obj)/%,$(OBJ))
+$(obj)/%.o: lzma/C/7zip/Compress/RangeCoder/%.cpp
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-tobj = $(obj)/tools
-tsrc = $(shell pwd)/tools
+$(obj)/%.o: lzma/C/7zip/Common/%.cpp
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-include $(tsrc)/Makefile
+$(obj)/%.o: lzma/C/Common/%.cpp
+	$(HOSTCXX) $(CXXFLAGS) -c -o $@ $<
 
-$(obj)/%.o: %.c $(INC)
-	$(CONFIG_HOSTCC) $(CFLAGS) -c -o $@ $<
+all: $(BINARY)
 
-install: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
-	@ install -d $(DESTDIR)
-	@ install -m 0755 $(obj)/cbfstool $(DESTDIR)/cbfstool
-	@ install -m 0755 $(obj)/tools/cbfs-mkstage $(DESTDIR)/cbfs-mkstage
-	@ install -m 0755 $(obj)/tools/cbfs-mkpayload $(DESTDIR)/cbfs-mkpayload
+clean:
+	rm -f $(COMMON) $(BINARY)
 
-tags: 
-	ctags *.[ch] */*.[ch]
+tags:
+	ctags *.[ch]
 
-clean: tools-clean
-	rm -f $(patsubst %,$(obj)/%,$(OBJ)) $(obj)/cbfstool
+CXXFLAGS=-DCOMPACT -g
+CFLAGS=-g
+LDFLAGS=-g
 
+$(obj)/cbfstool:$(COMMON)
+	$(HOSTCXX) $(LDFLAGS) -o $@ $^