ppc4xx: HCU4/5. Fix make O=../xx

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

diff --git a/Makefile b/Makefile
index 0f6cc59aeeba4ff3fe36bcd0be5308b08f881804..b3a1d2ff886aca1211c33880526ee6478be75083 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1225,9 +1225,11 @@ G2000_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
 hcu4_config:   unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
 hcu4_config:   unconfig

+       @mkdir -p $(obj)board/netstal/common

        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
 
 hcu5_config:   unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
 
 hcu5_config:   unconfig

+       @mkdir -p $(obj)board/netstal/common

        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
 
 HH405_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
 
 HH405_config:  unconfig

diff --git a/board/netstal/hcu4/Makefile b/board/netstal/hcu4/Makefile
index b13d9d446fb923b7540c6835ff64ef036445bd13..3d1d65d35ea9aa240fcf390fada809a15fd4fe05 100644 (file)
--- a/board/netstal/hcu4/Makefile
+++ b/board/netstal/hcu4/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# (C) Copyright 2007 Netstal Maschinen AG
+# (C) Copyright 2007-2008 Netstal Maschinen AG

 # Niklaus Giger (ng@netstal.com)
 #
 # This program is free software; you can redistribute it and/or
 # Niklaus Giger (ng@netstal.com)
 #
 # This program is free software; you can redistribute it and/or


@@ -22,18 +22,14 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
 
 LIB    = $(obj)lib$(BOARD).a
 

-vpath fixed_sdram.c ../common
-vpath hcu_flash.c ../common
-vpath nm_bsp.c ../common
-

 # NOBJS : Netstal common objects
 # NOBJS : Netstal common objects

-NOBJS  = ../common/fixed_sdram.o ../common/hcu_flash.o ../common/nm_bsp.o
+NOBJS  = fixed_sdram.o hcu_flash.o nm_bsp.o

 COBJS  = $(BOARD).o
 SOBJS  =
 
 COBJS  = $(BOARD).o
 SOBJS  =
 

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

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

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

 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS) $(NOBJS)
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS) $(NOBJS)

diff --git a/board/netstal/hcu5/Makefile b/board/netstal/hcu5/Makefile
index 9f248a441d7074bf5a25ecb3aa98ba3f4f2ae5f5..349c653e7f39d534a78d0038a6d2b9f5453c8a21 100644 (file)
--- a/board/netstal/hcu5/Makefile
+++ b/board/netstal/hcu5/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# (C) Copyright 2007 Netstal Maschinen AG
+# (C) Copyright 2007-2008 Netstal Maschinen AG

 # Niklaus Giger (ng@netstal.com)
 #
 # This program is free software; you can redistribute it and/or
 # Niklaus Giger (ng@netstal.com)
 #
 # This program is free software; you can redistribute it and/or


@@ -22,17 +22,15 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
 
 LIB    = $(obj)lib$(BOARD).a
 

-vpath hcu_flash.c ../common
-vpath nm_bsp.c ../common

 
 # NOBJS : Netstal common objects
 
 # NOBJS : Netstal common objects

-NOBJS  = ../common/hcu_flash.o ../common/nm_bsp.o
+NOBJS  = hcu_flash.o nm_bsp.o

 COBJS  = $(BOARD).o sdram.o
 SOBJS  = init.o
 
 COBJS  = $(BOARD).o sdram.o
 SOBJS  = init.o
 

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

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

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

 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS) $(NOBJS)
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(OBJS) $(SOBJS) $(NOBJS)