Always generate fsdata.c and rebuild httpd part

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 33aa55d090362f46f7bf0b3485e720edb854f0b2..5671d0101e6f9319decaccfa269e8751e22be03a 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -223,10 +223,10 @@ LIBS += lib_$(ARCH)/lib$(ARCH).a
 LIBS += drivers/libdrivers.a
 LIBS += net/libnet.a
 LIBS += rtc/librtc.a
-LIBS += httpd/libhttpd.a
 LIBS += $(BOARDLIBS)
 
-LIBS_SHARED = board/$(BOARDDIR)/lib$(BOARD).a
+LIBS_SHARED  = board/$(BOARDDIR)/lib$(BOARD).a
+LIBS_SHARED += httpd/libhttpd.a
 ifdef SOC
   LIBS_SHARED += cpu/$(CPU)/$(SOC)/lib$(SOC).a
 endif
@@ -278,7 +278,7 @@ u-boot.img: u-boot.bin
 u-boot.dis: u-boot
        $(OBJDUMP) -d $< > $@
 
-u-boot: depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LIBS_SHARED) $(LDSCRIPT)
+u-boot: fsdata depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LIBS_SHARED) $(LDSCRIPT)
        UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) $(LIBS_SHARED) | \
                   sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p' | \
                   sort | uniq`; \
@@ -344,6 +344,11 @@ endif # ifdef COMPRESSED_UBOOT
 version:
        @echo -n "#define U_BOOT_VERSION \"U-Boot $(U_BOOT_VERSION)\"" > $(VERSION_FILE)
 
+fsdata:
+       $(call echo_green,Preparing web server files...)
+       @echo
+       cd httpd && ./vendors/makefsdatac $(DEVICE_VENDOR)
+
 depend dep:
        @for dir in $(SUBDIRS); do $(MAKE) -C $$dir .depend; done
 

diff --git a/u-boot/httpd/Makefile b/u-boot/httpd/Makefile
index 406e4cc2143cd46795e1fe11a52ab7dfe2e09df2..d78fa43530ca67d6a6573f4e63ad365ac185007e 100644 (file)
--- a/u-boot/httpd/Makefile
+++ b/u-boot/httpd/Makefile
@@ -5,24 +5,22 @@
 include $(TOPDIR)/config.mk
 
 LIB   = libhttpd.a
-OBJS += uip.o uip_arch.o uip_arp.o httpd.o fs.o
+OBJS += uip.o \
+       uip_arch.o \
+       uip_arp.o \
+       httpd.o \
+       fs.o
 
-all:    $(LIB)
+all: $(LIB)
 
-fs.c:   fsdata.c
-
-fsdata.c:
-           ./vendors/makefsdatac $(DEVICE_VENDOR)
-
-$(LIB): $(START) $(OBJS)
-           $(AR) crv $@ $(OBJS)
+$(LIB): $(OBJS)
+       $(AR) crv $@ $(OBJS)
 
 #########################################################################
 
-.depend: Makefile $(OBJS:.o=.c)
-            $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
+.depend: Makefile fsdata.c $(OBJS:.o=.c)
+       $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
 
 sinclude .depend
 
 #########################################################################
-