tools/Makefile: Dynamically generate libfdt object dependencies

[u-boot] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index ec35f18dcdf766b618d274ba1cdfc73f294c2b0f..b1680adc0c9623ec07b3bea27e4ecb7deb791784 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -77,10 +77,11 @@ BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
 BIN_FILES-y += mkimage$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
-BIN_FILES-y += gen_eth_addr$(SFX)
+BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
 BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
 BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
 BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
+BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
 
 # Source files which are symlinked from elsewhere in U-Boot
 OBJ_LINKS-y += env_embedded.o
@@ -93,10 +94,11 @@ OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 OBJ_FILES-y += mkimage.o
 OBJ_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc.o
 OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o
-OBJ_FILES-y += gen_eth_addr.o
+OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
 OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
 OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
 OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o
+OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
 
 # Don't build by default
 #ifeq ($(ARCH),ppc)
@@ -125,6 +127,7 @@ endif
 
 # now $(obj) is defined
 SRCS   := $(addprefix $(obj),$(OBJ_LINKS-y:.o=.c)) $(OBJ_FILES-y:.o=.c)
+SRCS   += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
 BINS   := $(addprefix $(obj),$(BIN_FILES-y))
 LIBFDT_OBJS    := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
 
@@ -134,6 +137,8 @@ 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
 
@@ -219,19 +224,19 @@ $(obj)inca-swap-bytes.o:  $(src)inca-swap-bytes.c
 $(obj)mpc86x_clk.o:    $(src)mpc86x_clk.c
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
-$(obj)fdt.o:   $(obj)fdt.c
+$(obj)fdt.o:
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_ro.o:        $(obj)fdt_ro.c
+$(obj)fdt_ro.o:
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_rw.o:        $(obj)fdt_rw.c
+$(obj)fdt_rw.o:
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_strerror.o:  $(obj)fdt_strerror.c
+$(obj)fdt_strerror.o:
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
-$(obj)fdt_wip.o:       $(obj)fdt_wip.c
+$(obj)fdt_wip.o:
        $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
 
 subdirs:
@@ -255,11 +260,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
 
@@ -274,36 +275,6 @@ $(obj)sha1.c:
 $(obj)image.c:
        @rm -f $(obj)image.c
        ln -s $(src)../common/image.c $(obj)image.c
-       if [ ! -f $(obj)mkimage.h ] ; then \
-               ln -s $(src)../tools/mkimage.h $(obj)mkimage.h; \
-       fi
-       if [ ! -f $(obj)fdt_host.h ] ; then \
-               ln -s $(src)../tools/fdt_host.h $(obj)fdt_host.h; \
-       fi
-
-$(obj)fdt.c:   $(obj)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
-       @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
-       @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
-       @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
-       @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) >$@