]> git.sur5r.net Git - u-boot/commitdiff
tools: Remove unecessary symlinking of zlib.h
authorPeter Tyser <ptyser@xes-inc.com>
Fri, 13 Mar 2009 23:54:43 +0000 (18:54 -0500)
committerWolfgang Denk <wd@denx.de>
Fri, 3 Apr 2009 23:14:09 +0000 (01:14 +0200)
crc32.c uses the zlib.h header in include/u-boot/zlib.h.  The symlink
was previously necessary to give U-Boot's version of zlib.h precedence
over the host computer's version of zlib.h.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Makefile
tools/.gitignore
tools/Makefile

index 22a275b0582dcb876d5b075fdf18dd018966a0f1..3f01fccd2af444aafdf8e2c1865376a4bfeb2f85 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3532,7 +3532,7 @@ clobber:  clean
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
        @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
-       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h}
+       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c}
        @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
index 377ca9aaa88d8f85f5ad4437c386679c7ff813b9..c2ac0aefb557943f290435efee9bfd7b48f6ba03 100644 (file)
@@ -18,4 +18,3 @@
 /fdt_strerror.c
 /fdt_wip.c
 /libfdt_internal.h
-/zlib.h
index e1f262baae606b4b9dc2f8997bd0299e7f04855d..037f61b50047d15999bc92a829614a4f956e6861 100644 (file)
@@ -258,11 +258,7 @@ $(obj)env_embedded.c:
 $(obj)env_embedded.o:  $(obj)env_embedded.c
        $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-$(obj)zlib.h:
-       @rm -f $@
-       ln -s $(src)../include/zlib.h $@
-
-$(obj)crc32.c: $(obj)zlib.h
+$(obj)crc32.c: $(SRCTREE)/include/u-boot/zlib.h
        @rm -f $(obj)crc32.c
        ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c