From 45d6bdff68877ea214ff33cc1c89a29c76e96f51 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Fri, 13 Mar 2009 18:54:44 -0500 Subject: [PATCH] tools/Makefile: Add libfdt/ to the include search path This change makes the process of symlinking libfdt_internal.h unnecessary Signed-off-by: Peter Tyser --- Makefile | 2 +- tools/.gitignore | 1 - tools/Makefile | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 3f01fccd2a..db7fd88bdb 100644 --- a/Makefile +++ b/Makefile @@ -3533,7 +3533,7 @@ clobber: clean @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} - @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h} + @rm -f $(obj)tools/{fdt_wip.c} @rm -f $(obj)cpu/mpc824x/bedbug_603e.c @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f diff --git a/tools/.gitignore b/tools/.gitignore index c2ac0aefb5..ea39027ba2 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -17,4 +17,3 @@ /fdt_rw.c /fdt_strerror.c /fdt_wip.c -/libfdt_internal.h diff --git a/tools/Makefile b/tools/Makefile index 037f61b500..294d3883c2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -136,6 +136,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) CPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ + -I $(SRCTREE)/libfdt \ -I $(SRCTREE)/tools \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O @@ -274,30 +275,26 @@ $(obj)image.c: @rm -f $(obj)image.c ln -s $(src)../common/image.c $(obj)image.c -$(obj)fdt.c: $(obj)libfdt_internal.h +$(obj)fdt.c: $(SRCTREE)/libfdt/libfdt_internal.h @rm -f $(obj)fdt.c ln -s $(src)../libfdt/fdt.c $(obj)fdt.c -$(obj)fdt_ro.c: $(obj)libfdt_internal.h +$(obj)fdt_ro.c: $(SRCTREE)/libfdt/libfdt_internal.h @rm -f $(obj)fdt_ro.c ln -s $(src)../libfdt/fdt_ro.c $(obj)fdt_ro.c -$(obj)fdt_rw.c: $(obj)libfdt_internal.h +$(obj)fdt_rw.c: $(SRCTREE)/libfdt/libfdt_internal.h @rm -f $(obj)fdt_rw.c ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c -$(obj)fdt_strerror.c: $(obj)libfdt_internal.h +$(obj)fdt_strerror.c: $(SRCTREE)/libfdt/libfdt_internal.h @rm -f $(obj)fdt_strerror.c ln -s $(src)../libfdt/fdt_strerror.c $(obj)fdt_strerror.c -$(obj)fdt_wip.c: $(obj)libfdt_internal.h +$(obj)fdt_wip.c: $(SRCTREE)/libfdt/libfdt_internal.h @rm -f $(obj)fdt_wip.c ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c -$(obj)libfdt_internal.h: - @rm -f $(obj)libfdt_internal.h - ln -s $(src)../libfdt/libfdt_internal.h $(obj)libfdt_internal.h - $(LOGO_H): $(obj)bmp_logo $(LOGO_BMP) $(obj)./bmp_logo $(LOGO_BMP) >$@ -- 2.25.1