hcu4, hcu5: fix out of tree building

Out of tree building of the Netstal hcu4 and hcu5 boards failed like
that:

Assembler messages:
Fatal error: can't create /work/wd/tmp-ppc/board/netstal/hcu4/../common/fixed_sdram.o: No such file or directory
Assembler messages:
Fatal error: can't create /work/wd/tmp-ppc/board/netstal/hcu4/../common/nm_bsp.o: No such file or directory
make[1]: *** [/work/wd/tmp-ppc/board/netstal/hcu4/../common/fixed_sdram.o] Error 2

Adapt (and simplify) the respective Makefiles.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Niklaus Giger <niklaus.giger@netstal.com>

diff --git a/board/netstal/hcu4/Makefile b/board/netstal/hcu4/Makefile
index 6722d53927e45f896ed3705fa4874ab435aedecb..cd62642894425f87b0140c7fd330d49697fa37b2 100644 (file)
--- a/board/netstal/hcu4/Makefile
+++ b/board/netstal/hcu4/Makefile
@@ -19,24 +19,24 @@
 #
 
 include $(TOPDIR)/config.mk
 #
 
 include $(TOPDIR)/config.mk

+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif

 
 LIB    = $(obj)lib$(BOARD).a
 
 
 LIB    = $(obj)lib$(BOARD).a
 

-# NOBJS : Netstal common objects
-NOBJS  = fixed_sdram.o nm_bsp.o
-COBJS  = $(BOARD).o
-SOBJS  =
+COBJS  = $(BOARD).o \
+       ../common/fixed_sdram.o \
+       ../common/nm_bsp.o

 
 

-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix ../common/,$(NOBJS:.o=.c))
+SRCS   := $(COBJS:.o=.c)

 OBJS   := $(addprefix $(obj),$(COBJS))
 OBJS   := $(addprefix $(obj),$(COBJS))

-NOBJS  := $(addprefix $(obj)../common/,$(NOBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))

 
 

-$(LIB):        $(OBJS) $(SOBJS) $(NOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) $(NOBJS)
+$(LIB):        $(OBJS)
+       $(AR) $(ARFLAGS) $@ $^

 
 clean:
 
 clean:

-       rm -f $(SOBJS) $(OBJS)
+       rm -f $(OBJS)

 
 distclean:     clean
        rm -f $(LIB) core *.bak $(obj).depend
 
 distclean:     clean
        rm -f $(LIB) core *.bak $(obj).depend

diff --git a/board/netstal/hcu5/Makefile b/board/netstal/hcu5/Makefile
index 445677104c8f2d26c294186e06847f60db1ffa54..d037552d709bc481fb5a3e787b93da7bb67c492e 100644 (file)
--- a/board/netstal/hcu5/Makefile
+++ b/board/netstal/hcu5/Makefile
@@ -19,22 +19,23 @@
 #
 
 include $(TOPDIR)/config.mk
 #
 
 include $(TOPDIR)/config.mk

+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif

 
 LIB    = $(obj)lib$(BOARD).a
 
 
 LIB    = $(obj)lib$(BOARD).a
 

-
-# NOBJS : Netstal common objects
-NOBJS  = nm_bsp.o
-COBJS  = $(BOARD).o sdram.o
+COBJS  = $(BOARD).o \
+       sdram.o \
+       ../common/nm_bsp.o

 SOBJS  = init.o
 
 SOBJS  = init.o
 

-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix ../common/,$(NOBJS:.o=.c))
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)

 OBJS   := $(addprefix $(obj),$(COBJS))
 OBJS   := $(addprefix $(obj),$(COBJS))

-NOBJS  := $(addprefix $(obj)../common/,$(NOBJS))

 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 

-$(LIB):        $(OBJS) $(SOBJS) $(NOBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) $(NOBJS)
+$(LIB):        $(OBJS) $(SOBJS)
+       $(AR) $(ARFLAGS) $@ $^

 
 clean:
        rm -f $(SOBJS) $(OBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)