diff --git a/msb-430-common/drivers/include/sht11-board.h b/msb-430-common/drivers/include/sht11-board.h index a4debd4473..13aeb89968 100644 --- a/msb-430-common/drivers/include/sht11-board.h +++ b/msb-430-common/drivers/include/sht11-board.h @@ -1,5 +1,5 @@ /****************************************************************************** -Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved. +Copyright 2013, Freie Universitaet Berlin (FUB). All rights reserved. These sources were developed at the Freie Universitaet Berlin, Computer Systems and Telematics group (http://cst.mi.fu-berlin.de). @@ -36,10 +36,8 @@ and the mailinglist (subscription via web site) * @file * @brief SHT11 Device Driver Configuration For MSB-430 Platform * - * @author Freie Universität Berlin, Computer Systems & Telematics, µkleos - * @version $Revision$ + * @author Freie Universität Berlin, Computer Systems & Telematics, RIOT * - * @note $Id$ */ #include #include diff --git a/msb-430-common/makefile b/msb-430-common/makefile index 021a4f163f..7f3a80971e 100644 --- a/msb-430-common/makefile +++ b/msb-430-common/makefile @@ -1,7 +1,6 @@ SRC = $(wildcard *.c) BINDIR = $(RIOTBOARD)/$(BOARD)/bin/ OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines - DEP = $(SRC:%.c=$(BINDIR)%.d) INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/ @@ -9,10 +8,13 @@ INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/ INCLUDES += -I$(RIOTBASE)/drivers/include/ +.PHONY: $(BINDIR)$(ARCH) + all: $(BINDIR)$(ARCH) $(MAKE) -C drivers $(BINDIR)$(ARCH): $(OBJ) + echo $(AR) rcs $(BINDIR)$(ARCH) $(OBJ) $(AR) rcs $(BINDIR)$(ARCH) $(OBJ) # pull in dependency info for *existing* .o files diff --git a/msba2-common/makefile b/msba2-common/makefile index 73ea5843d4..1ac90178e1 100644 --- a/msba2-common/makefile +++ b/msba2-common/makefile @@ -1,7 +1,6 @@ SRC = $(wildcard *.c) BINDIR = $(RIOTBOARD)/$(BOARD)/bin/ OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines - DEP = $(SRC:%.c=$(BINDIR)%.d) INCLUDES += -I$(RIOTBOARD)/msba2-common/include/ @@ -9,6 +8,8 @@ INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/ INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/ INCLUDES += -I$(RIOTBASE)/drivers/include/ +.PHONY: $(BINDIR)msba2_common_base.a + all: $(BINDIR)msba2_common_base.a $(MAKE) -C drivers @@ -26,6 +27,6 @@ $(BINDIR)%.o: %.c # remove compilation products clean: - make -C drivers clean + ${MAKE} -C drivers clean rm -f $(OBJ) $(DEP)