mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
* replaced new Makefile name in Makefiles
This commit is contained in:
Oliver Hahm
parent
5ffe5a9c27
commit
7a4dec1830
@ -1,8 +1,8 @@
|
||||
ASMSRC = $(wildcard *.s)
|
||||
ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
|
||||
SRC = $(wildcard *.c)
|
||||
OBJ = $(SRC:%.c=$(BINDIR)%.o)
|
||||
DEP = $(SRC:%.c=$(BINDIR)%.d)
|
||||
ASMSRC = $(wildcard *.s)
|
||||
ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
|
||||
SRC = $(wildcard *.c)
|
||||
OBJ = $(SRC:%.c=$(BINDIR)%.o)
|
||||
DEP = $(SRC:%.c=$(BINDIR)%.d)
|
||||
|
||||
ifeq ($(CPU),lpc2387)
|
||||
INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
|
||||
@ -25,6 +25,11 @@ ifeq ($(BOARD),msba2)
|
||||
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
|
||||
INCLUDES += -I$(RIOTBOARD)/msba2-common/drivers/include/
|
||||
endif
|
||||
ifeq ($(BOARD),msb-430)
|
||||
INCLUDES += -I$(RIOTBOARD)/msb-430/include/
|
||||
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
|
||||
INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
|
||||
endif
|
||||
ifeq ($(BOARD),msb-430h)
|
||||
INCLUDES += -I$(RIOTBOARD)/msb-430h/include/
|
||||
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
|
||||
|
||||
@ -25,6 +25,6 @@ BL=$(USEMODULE:%= $(BINDIR)%.a)
|
||||
export BASELIBS = $(shell echo $(BL)|sed 's/[^ ]*hwtimer.a//')
|
||||
CFLAGS += $(EXTDEFINES)
|
||||
|
||||
include $(RIOTBASE)/makefile.dep
|
||||
include $(RIOTBASE)/Makefile.dep
|
||||
|
||||
export USEMODULE
|
||||
|
||||
@ -2,4 +2,4 @@ MODULE =core
|
||||
|
||||
INCLUDES = -Iinclude/ -I../sys/include -I../sys/lib -I../sys/drivers/include -I../cpu/$(CPU)/include/ -I../.. -I../drivers/include/
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
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
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ DIRS =
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
clean::
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
|
||||
|
||||
@ -15,7 +15,7 @@ endif
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
clean::
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
|
||||
|
||||
@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -
|
||||
|
||||
MODULE =gpioint
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -
|
||||
|
||||
MODULE =mci
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
|
||||
|
||||
MODULE =rtc
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ DIRS =
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
clean::
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
|
||||
|
||||
@ -6,7 +6,7 @@ DIRS =
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
clean::
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
|
||||
|
||||
117
dist/Makefile
vendored
117
dist/Makefile
vendored
@ -3,120 +3,29 @@
|
||||
####
|
||||
#### The Sample Filesystem Layout is:
|
||||
#### /this makefile
|
||||
#### ../RIOT
|
||||
#### ../RIOT/board for board definitions (if you have one or more)
|
||||
####
|
||||
#### ../../RIOT
|
||||
#### ../../boards for board definitions (if you have one or more)
|
||||
####/..
|
||||
|
||||
#### Mandatory vars!
|
||||
# name of your project
|
||||
export PROJECT =foobar
|
||||
|
||||
# for easy switching of boards
|
||||
export BOARD = msb-430
|
||||
|
||||
# this has to be the absolute path of the RIOT-base dir
|
||||
export RIOTBASE =$(CURDIR)/../RIOT
|
||||
export RIOTBOARD =$(CURDIR)/../RIOT/board
|
||||
|
||||
# the cpu to build for
|
||||
export CPU = lpc2387
|
||||
|
||||
# toolchain config
|
||||
export PREFIX = @arm-elf-
|
||||
export CC = @$(PREFIX)gcc
|
||||
export AR = @$(PREFIX)ar
|
||||
export CFLAGS = -std=gnu99 -O2 -Wall -Wstrict-prototypes -mcpu=arm7tdmi-s -gdwarf-2
|
||||
export ASFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s
|
||||
export AS = $(PREFIX)as
|
||||
export LINK = $(PREFIX)gcc
|
||||
export SIZE = $(PREFIX)size
|
||||
export OBJCOPY = $(PREFIX)objcopy
|
||||
FLASH = lpc2k_pgm
|
||||
TERM = pyterm.py
|
||||
LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x
|
||||
|
||||
PROJBINDIR = bin
|
||||
|
||||
ifeq ($(strip $(PORT)),)
|
||||
PORT = /dev/ttyUSB0
|
||||
endif
|
||||
export RIOTBASE =$(CURDIR)/../../RIOT
|
||||
export RIOTBOARD =$(CURDIR)/../../boards
|
||||
|
||||
## Modules to include.
|
||||
|
||||
#USEMODULE += nanopan5375_proprietary
|
||||
#USEMODULE += sys
|
||||
#USEMODULE += cmdd
|
||||
#USEMODULE += logd
|
||||
#USEMODULE += mprint
|
||||
#USEMODULE += mqueue
|
||||
#USEMODULE += sync_read
|
||||
#USEMODULE += sysmon
|
||||
#USEMODULE += syslog
|
||||
#USEMODULE += tracelog
|
||||
#USEMODULE += shell
|
||||
#USEMODULE += utimer
|
||||
#USEMODULE += vtimer
|
||||
#USEMODULE += sht11
|
||||
#USEMODULE += powermon
|
||||
#USEMODULE += ltc4150
|
||||
#USEMODULE += sys_config
|
||||
#USEMODULE += cc110x
|
||||
#USEMODULE += cmdengine
|
||||
#USEMODULE += ezxml
|
||||
#USEMODULE += fat
|
||||
#USEMODULE += gps
|
||||
#USEMODULE += geo
|
||||
#USEMODULE += gps_conversion
|
||||
#USEMODULE += gps_ublox
|
||||
#USEMODULE += net_kernel
|
||||
#USEMODULE += net_mm
|
||||
|
||||
#### Project Config
|
||||
export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/cpu/$(CPU)/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
|
||||
|
||||
# name of your project
|
||||
PROJECT = hello-world
|
||||
|
||||
# for easy switching of boards
|
||||
export BOARD = msba2
|
||||
|
||||
# mandatory include!
|
||||
include $(RIOTBASE)/makefile.modules
|
||||
|
||||
# if you want to publish the board into the sources as an uppercase #define
|
||||
BB = $(shell echo $(BOARD)|tr 'a-z' 'A-Z')
|
||||
CFLAGS += -DBOARD_$(BB)
|
||||
export CFLAGS
|
||||
|
||||
# your binaries to link
|
||||
BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
|
||||
BASELIBS += $(PROJBINDIR)/project.a
|
||||
|
||||
INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/cpu/$(CPU)/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
|
||||
|
||||
export INCLUDES
|
||||
|
||||
## make script for your project. Build RIOT-base here!
|
||||
all: $(PROJBINDIR)/$(PROJECT).a
|
||||
@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
|
||||
$(MAKE) -C $(RIOTBOARD)
|
||||
$(MAKE) -C $(RIOTBASE)
|
||||
$(LINK) $(LINKFLAGS) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map
|
||||
$(SIZE) $(PROJBINDIR)/$(PROJECT).elf
|
||||
$(OBJCOPY) -O ihex $(PROJBINDIR)/$(PROJECT).elf $(PROJBINDIR)/$(PROJECT).hex
|
||||
|
||||
## your make rules
|
||||
## Only basic example - modify it for larger projects!!
|
||||
|
||||
$(PROJBINDIR)/$(PROJECT).a: $(PROJBINDIR)/$(PROJECT).o
|
||||
$(AR) -rc $(PROJBINDIR)/project.a $(PROJBINDIR)/$(PROJECT).o
|
||||
|
||||
$(PROJBINDIR)/$(PROJECT).o: main.c
|
||||
$(CC) $(CFLAGS) $(BOARDINCLUDE) $(INCLUDES) -c main.c -o $(PROJBINDIR)/$(PROJECT).o
|
||||
|
||||
clean:
|
||||
$(MAKE) -C $(RIOTBOARD) clean
|
||||
$(MAKE) -C $(RIOTBASE) clean
|
||||
rm -f $(PROJBINDIR)/*
|
||||
|
||||
flash: all
|
||||
$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
|
||||
|
||||
term:
|
||||
$(TERM) $(PORT)
|
||||
|
||||
doc:
|
||||
make -BC $(RIOTBASE) doc
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
2
dist/tools/testsuite/generate_html.sh
vendored
2
dist/tools/testsuite/generate_html.sh
vendored
@ -6,7 +6,7 @@ HTMLDIR=${TOOLROOT}/tools/testsuite/html
|
||||
|
||||
test -f ~/.buildbot && . ~/.buildbot
|
||||
|
||||
OUTFILE=${HTMLFILE:-${HOME}/firekernel.html}
|
||||
OUTFILE=${HTMLFILE:-${HOME}/riot.html}
|
||||
LOGDIR=${BUILDLOGS:-${HOME}/buildlogs}
|
||||
|
||||
{
|
||||
|
||||
@ -24,7 +24,7 @@ endif
|
||||
all:
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
# remove compilation products
|
||||
clean::
|
||||
|
||||
@ -2,6 +2,6 @@ INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../.
|
||||
|
||||
MODULE =cc110x_ng
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ endif
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
clean::
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
|
||||
|
||||
@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../.
|
||||
|
||||
MODULE =cc110x_spi
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I$(RIOTBASE)/core/include -I../include/
|
||||
MODULE =ltc4150
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
|
||||
MODULE =sht11
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ endif
|
||||
all: $(BINDIR)$(MODULE).a
|
||||
@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
# remove compilation products
|
||||
clean::
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
|
||||
MODULE =auto_init
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include
|
||||
MODULE =config
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
|
||||
MODULE =lib
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -2,6 +2,6 @@ INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include
|
||||
|
||||
MODULE =logd
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -2,5 +2,5 @@ INCLUDES = -I.. -I../../include -I../../drivers/include -I../../../core/include
|
||||
|
||||
MODULE =net_mm
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
|
||||
MODULE =ping
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include
|
||||
MODULE =posix
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
|
||||
MODULE =ps
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#SRC = cc1100.c cc110x_ng.c disk.c id.c ltc4150.c ps.c rtc.c shell.c shell_commands.c sht11.c
|
||||
SRC = shell_commands.c sc_id.c
|
||||
INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
|
||||
|
||||
#cc1100.c cc110x_ng.c disk.c id.c Jamfile ltc4150.c makefile makefile.commands ps.c rtc.c shell.c shell_commands.c sht11.c
|
||||
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
|
||||
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
|
||||
SRC += sc_cc110x_ng.c
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
|
||||
MODULE =swtimer
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
|
||||
MODULE =syslog
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include
|
||||
MODULE =timex
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
|
||||
MODULE =tracelog
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
INCLUDES = -I../include -I$(RIOTBAE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../net -I../../hal/include -I../../core/include -I../config
|
||||
MODULE =transceiver
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -2,6 +2,6 @@ INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include
|
||||
|
||||
MODULE =uart0
|
||||
|
||||
include $(MAKEBASE)/makefile.base
|
||||
include $(MAKEBASE)/Makefile.base
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
|
||||
MODULE =vtimer
|
||||
|
||||
include $(RIOTBASE)/makefile.base
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user