Merge branch 'master' of github.com:RIOT-OS/boards

RIOT-OS · Mar 13, 2013 · b786851 · b786851
2 parents 8df4d77 + 8b563bb
commit b786851
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/msb-430-common/Makefile b/msb-430-common/Makefile
@@ -1,18 +1,20 @@
 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/
 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/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 <msp430x16x.h>
 #include <bitarithm.h>

diff --git a/msba2-common/Makefile b/msba2-common/Makefile
@@ -1,14 +1,15 @@
 SRC = $(wildcard *.c)
 BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
 OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
-
 DEP = $(SRC:%.c=$(BINDIR)%.d)
 
 INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
 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)