From: Richard Purdie Update arch Makefiles to reflect zlib_inflate library changes. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton --- arch/powerpc/boot/Makefile | 4 ++-- arch/ppc/boot/lib/Makefile | 2 +- arch/xtensa/boot/lib/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/powerpc/boot/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix arch/powerpc/boot/Makefile --- devel/arch/powerpc/boot/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix 2006-04-09 21:23:10.000000000 -0700 +++ devel-akpm/arch/powerpc/boot/Makefile 2006-04-09 21:23:10.000000000 -0700 @@ -29,8 +29,8 @@ OBJCOPYFLAGS := contents,alloc,load,r OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000 OBJCOPY_MIB_ARGS := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment -zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c -zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h +zlib := inffast.c inflate.c inftrees.c +zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h zliblinuxheader := zlib.h zconf.h zutil.h $(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) diff -puN arch/ppc/boot/lib/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix arch/ppc/boot/lib/Makefile --- devel/arch/ppc/boot/lib/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix 2006-04-09 21:23:10.000000000 -0700 +++ devel-akpm/arch/ppc/boot/lib/Makefile 2006-04-09 21:23:10.000000000 -0700 @@ -5,7 +5,7 @@ CFLAGS_kbd.o := -Idrivers/char CFLAGS_vreset.o := -Iarch/ppc/boot/include -zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c +zlib := inffast.c inflate.c inftrees.c lib-y += $(zlib:.c=.o) div64.o lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o diff -puN arch/xtensa/boot/lib/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix arch/xtensa/boot/lib/Makefile --- devel/arch/xtensa/boot/lib/Makefile~zlib_inflate-upgrade-library-code-to-a-recent-version-fix 2006-04-09 21:23:10.000000000 -0700 +++ devel-akpm/arch/xtensa/boot/lib/Makefile 2006-04-09 21:23:10.000000000 -0700 @@ -2,7 +2,7 @@ # Makefile for some libs needed by zImage. # -zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c +zlib := inffast.c inflate.c inftrees.c lib-y += $(zlib:.c=.o) zmem.o _