marc
/
RIOT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

further Makefile cleanup

Browse Source
dev/timer
Oleg Hahm 9 years ago
parent f8e349f76e
commit 02612ff0ca
20 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
Makefile.include
Unescape Escape View File

@ -20,9 +20,9 @@ export CFLAGS
export BINDIR =$(CURDIR)/bin/
# mandatory includes!
include $(RIOTBASE)/Makefile.modules
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include
include $(RIOTBASE)/Makefile.modules
# your binaries to link
BASELIBS += $(BINDIR)$(BOARD)_base.a

1
boards/chronos/Makefile
Unescape Escape View File

@ -1,5 +1,6 @@
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
DIRS = drivers
all: $(BINDIR)$(MODULE).a

2
boards/chronos/Makefile.include
Unescape Escape View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include -I$(RIOTCPU)/cc430/include -I$(RIOTCPU)/msp430-common/include
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
## the cpu to build for
export CPU = cc430

24
boards/chronos/drivers/Makefile
Unescape Escape View File

@ -1,23 +1,5 @@
SRC = $(wildcard *.c)
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
MODULE =$(BOARD)_base
INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/
$(BINDIR)chronos_drivers.a: $(OBJ)
$(AR) rcs $(BINDIR)chronos_base.a $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
# compile and generate dependency info
$(BINDIR)%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
# remove compilation products
clean:
rm -f $(OBJ) $(DEP)
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
boards/msb-430h/Makefile
Unescape Escape View File

@ -2,6 +2,8 @@ MODULE =$(BOARD)_base
DIRS = $(RIOTBOARD)/msb-430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

2
boards/msb-430h/Makefile.include
Unescape Escape View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBASE)/drivers/cc110x_ng/include
export INCLUDES += -I$(RIOTBOARD)/msb-430h/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/msb-430-common/Makefile.include

3
boards/msba2-common/Makefile.include
Unescape Escape View File

@ -23,5 +23,6 @@ export HEXFILE = bin/$(PROJECT).hex
export FFLAGS = $(PORT) $(BINDIR)$(PROJECT).hex
include $(RIOTBOARD)/msba2-common/Makefile.dep
export INCLUDES += -I$(RIOTCPU)/lpc2387/include -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include/
export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
export OFLAGS = -O ihex

1
boards/msba2-common/drivers/Makefile
Unescape Escape View File

@ -1,5 +1,6 @@
MODULE =$(BOARD)_base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
boards/native/Makefile.include
Unescape Escape View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/native/include
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
export CPU = native
# toolchain config

2
boards/native/drivers/native-uart0.c
Unescape Escape View File

@ -225,6 +225,7 @@ void handle_uart_sock()
_native_uart_conn = s;
}
#ifdef MODULE_UART0
void _native_handle_uart0_input()
{
if (FD_ISSET(STDIN_FILENO, &_native_rfds)) {
@ -250,6 +251,7 @@ int _native_set_uart_fds(void)
return ((STDIN_FILENO > _native_uart_sock) ? STDIN_FILENO : _native_uart_sock);
}
}
#endif
void _native_init_uart0(char *stdiotype, char *ioparam)
{

2
boards/wsn430-common/Makefile.include
Unescape Escape View File

@ -20,6 +20,6 @@ endif
export HEXFILE = bin/$(PROJECT).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBASE)/sys/net/include/
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
export OFLAGS = -O ihex

1
boards/wsn430-v1_3b/Makefile
Unescape Escape View File

@ -1,6 +1,7 @@
MODULE =$(BOARD)_base
DIRS = $(RIOTBOARD)/wsn430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

2
boards/wsn430-v1_3b/Makefile.include
Unescape Escape View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc110x_ng/include
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include

2
boards/wsn430-v1_4/Makefile.include
Unescape Escape View File

@ -1,4 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc2420/include
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include

1
cpu/arm_common/Makefile
Unescape Escape View File

@ -1,5 +1,4 @@
MODULE =arm_common
INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../.. -I../../sys/lib/fat
CFLAGS += $(CFLAGS_BASIC)
include $(RIOTBASE)/Makefile.base

2
cpu/cc430/Makefile
Unescape Escape View File

@ -2,6 +2,8 @@ MODULE = cpu
DIRS = $(RIOTCPU)/msp430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;

4
cpu/cc430/Makefile.include
Unescape Escape View File

@ -1,2 +1,4 @@
INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
include $(RIOTCPU)/msp430-common/Makefile.include

2
cpu/lpc1768/Makefile
Unescape Escape View File

@ -7,8 +7,6 @@ CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3
LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(PROJECT).map,--cref --specs=nano.specs
LD_SYS_LIBS = -lc -lgcc -lnosys
INCLUDES = -Iinclude -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/lib
all: $(BINDIR)$(MODULE).a
include $(RIOTBASE)/Makefile.base

2
cpu/lpc2387/i2c/Makefile
Unescape Escape View File

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
MODULE =i2c
include $(MAKEBASE)/Makefile.base

2
sys/auto_init/Makefile
Unescape Escape View File

@ -1,6 +1,4 @@
MODULE = auto_init
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

Write Preview
Loading…
Cancel
Save