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 <pty...@xes-inc.com>
---
Makefile | 2 +-
tools/.gitignore | 1 -
tools/Makefile | 6 +-----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index b68de1c..8179bcb 100644
--- a/Makefile
+++ b/Makefile
@@ -3482,7 +3482,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
diff --git a/tools/.gitignore b/tools/.gitignore
index 377ca9a..c2ac0ae 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -18,4 +18,3 @@
/fdt_strerror.c
/fdt_wip.c
/libfdt_internal.h
-/zlib.h
diff --git a/tools/Makefile b/tools/Makefile
index e1f262b..037f61b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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
--
1.6.0.2.GIT
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
