Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / xtensa / boot / lib / Makefile

diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile
index c0a74dc3a0dfa2510ff2391903b2d2db0a9f7b92..d3d2aa2d883aa6e4d9abfc7571b7e3e5eadbc30f 100644 (file)
--- a/arch/xtensa/boot/lib/Makefile
+++ b/arch/xtensa/boot/lib/Makefile
@@ -2,5 +2,16 @@
 # Makefile for some libs needed by zImage.
 #
 
+zlib   := inffast.c inflate.c inftrees.c
 
-lib-y := zlib.o zmem.o
+lib-y  += $(zlib:.c=.o) zmem.o
+
+EXTRA_CFLAGS   += -Ilib/zlib_inflate
+
+quiet_cmd_copy_zlib = COPY    $@
+      cmd_copy_zlib = cat $< > $@
+
+$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
+       $(call cmd,copy_zlib)
+
+clean-files    := $(zlib)