diff --git a/msb-430-common/board_init.c b/msb-430-common/board_init.c index b34642861e..4673600445 100644 --- a/msb-430-common/board_init.c +++ b/msb-430-common/board_init.c @@ -3,7 +3,6 @@ #include "kernel_intern.h" #include "msp430.h" #include "debug.h" -#include "msb430-uart1.h" volatile static uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED; diff --git a/msb-430h/makefile b/msb-430h/makefile index 327f5d6825..91c5da5880 100644 --- a/msb-430h/makefile +++ b/msb-430h/makefile @@ -29,7 +29,7 @@ $(BINDIR)%.o: %.c # remove compilation products clean: $(MAKE) -C ../msb-430-common clean - rm -f $(BINDIR)msb-430_base.a $(OBJ) $(DEP) + rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP) @if [ -d $(BINDIR) ] ; \ then rmdir $(BINDIR) ; \ fi diff --git a/msba2-common/makefile b/msba2-common/makefile index 61afe95c5f..73ea5843d4 100644 --- a/msba2-common/makefile +++ b/msba2-common/makefile @@ -13,7 +13,7 @@ all: $(BINDIR)msba2_common_base.a $(MAKE) -C drivers $(BINDIR)msba2_common_base.a: $(OBJ) - $(AR) rcs $(BINDIR)msba2_base.a $(OBJ) + $(AR) rcs $(BINDIR)$(ARCH) $(OBJ) # pull in dependency info for *existing* .o files -include $(OBJ:.o=.d) diff --git a/msba2/makefile b/msba2/makefile index 06f501ed5c..dab7d39a76 100644 --- a/msba2/makefile +++ b/msba2/makefile @@ -1,6 +1,7 @@ SRC = $(wildcard *.c) BINDIR = bin/ OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines +export ARCH = msba2_base.a DEP = $(SRC:%.c=$(BINDIR)%.d) @@ -8,11 +9,11 @@ INCLUDES += -I$(RIOTBOARD)/msba2-common/include/ INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/ INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/ -all: $(BINDIR)msba2_base.a +all: $(BINDIR)$(ARCH) $(MAKE) -C ../msba2-common -$(BINDIR)msba2_base.a: $(OBJ) - $(AR) rcs $(BINDIR)msba2_base.a $(OBJ) +$(BINDIR)$(ARCH): $(OBJ) + $(AR) rcs $(BINDIR)$(ARCH) $(OBJ) # pull in dependency info for *existing* .o files -include $(OBJ:.o=.d) @@ -27,7 +28,7 @@ $(BINDIR)%.o: %.c # remove compilation products clean: $(MAKE) -C ../msba2-common clean - rm -f $(BINDIR)msba2_base.a $(OBJ) $(DEP) + rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP) @if [ -d $(BINDIR) ] ; \ then rmdir $(BINDIR) ; \ fi