diff --git a/Makefile.base b/Makefile.base index dbc33f8811e5b887d9a003e5cc1201b141a5a28a..5ea0a1565774f74bd889f9258a2768f955f894da 100644 --- a/Makefile.base +++ b/Makefile.base @@ -24,24 +24,24 @@ export CFLAGS += -DVERSION=\"$(GIT_VERSION)\" .PHONY: clean $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ) - @$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ) + $(AD)$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ) # pull in dependency info for *existing* .o files -include $(OBJ:.o=.d) # compile and generate dependency info $(BINDIR)%.o: %.c - @$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o - @$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d + $(AD)$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + $(AD)$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d $(BINDIR)%.o: %.s - @$(AS) $(ASFLAGS) $*.s -o $(BINDIR)$*.o + $(AD)$(AS) $(ASFLAGS) $*.s -o $(BINDIR)$*.o $(BINDIR)%.o: %.S - @$(CC) -c $(CFLAGS) $*.S -o $(BINDIR)$*.o + $(AD)$(CC) -c $(CFLAGS) $*.S -o $(BINDIR)$*.o # remove compilation products clean:: - @rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ) + $(AD)rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ) diff --git a/Makefile.include b/Makefile.include index 346b3cdcca4a9bfbb8c65dec355f6cec69c9ee9a..ab1ae0755895363452de1ead8dedbb4a690bddb8 100644 --- a/Makefile.include +++ b/Makefile.include @@ -54,7 +54,7 @@ all: $(BINDIR)$(PROJECT).a "$(MAKE)" -C $(RIOTBASE) @for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i ; done ; ifeq ($(BUILDOSXNATIVE),1) - @$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie + $(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie else @$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(PROJECT).map $(LINKFLAGS) @$(SIZE) $(BINDIR)$(PROJECT).elf @@ -73,7 +73,7 @@ SRC = $(wildcard *.c) OBJ = $(SRC:%.c=${BINDIR}%.o) $(BINDIR)$(PROJECT).a: $(OBJ) - $(AR) -rc $(BINDIR)$(PROJECT).a $(OBJ) + $(AD)$(AR) -rc $(BINDIR)$(PROJECT).a $(OBJ) # pull in dependency info for *existing* .o files -include $(OBJ:.o=.d) @@ -81,7 +81,7 @@ $(BINDIR)$(PROJECT).a: $(OBJ) $(BINDIR)%.o: %.c $(PROJDEPS) @echo; echo "Compiling.... $*.c"; echo @test -d $(BINDIR) || mkdir -p $(BINDIR) - $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + $(AD)$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o clean: "$(MAKE)" -C $(RIOTBOARD)/$(BOARD) clean diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index bf2869c5f70c5b68741a24494fb8784b529e6b82..f3c9891a3f88f04d7037782f639734dae74ac2a0 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -5,9 +5,9 @@ export CPU = cc430 export MCU = cc430f6137 # toolchain config -export PREFIX = @msp430- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = msp430- +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU) -D CC430 export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2 export AS = $(PREFIX)as diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index d7502094097ac566681056f60f89001b22d9925a..fa2ff2de70492454c42b11924a562b1c582d5945 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -3,8 +3,8 @@ export CPU = lpc1768 # toolchain config export PREFIX = arm-none-eabi- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -DUSE_STDPERIPH_DRIVER -ggdb -g3 -std=gnu99 -O0 -Wall -Wstrict-prototypes -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian -mthumb -mthumb-interwork -nostartfiles export ASFLAGS = -ggdb -g3 -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian export AS = $(PREFIX)as diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index 57b5e6e0535414336f2df96a5e3879f4ce4b0164..d25fd8efeec43c19157891c501c9b57b4414c674 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -3,9 +3,9 @@ export CPU = msp430x16x export MCU = msp430f1612 # toolchain config -export PREFIX = @msp430- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = msp430- +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU) export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2 export AS = $(PREFIX)as diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include index a0a4937c91bcfe7f52953e8ace000d55ab784adf..85589d8162d5b3f05293165863a03bc7d4d179ba 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/msba2-common/Makefile.include @@ -2,10 +2,10 @@ export CPU = lpc2387 # toolchain config -export PREFIX = @arm-none-eabi- -#export PREFIX = @arm-elf- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = arm-none-eabi- +#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 diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 46231f89dc58d96f0e826beb8b65c76487e86298..06798698a2dd0b0958d9e9de0b5ba3704e40dba0 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -3,8 +3,8 @@ export CPU = native # toolchain config export PREFIX = -#export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +#export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -Wall -Wextra -pedantic -m32 export ASFLAGS = export AS = $(PREFIX)as diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include index e21f45ba00cf5b06eb11e2c1c519e89c580aed2a..f513dbd8881b81554dfeb96336aee86f92bd270b 100644 --- a/boards/redbee-econotag/Makefile.include +++ b/boards/redbee-econotag/Makefile.include @@ -2,9 +2,9 @@ export CPU = mc1322x # toolchain config -export PREFIX = @arm-none-eabi- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = arm-none-eabi- +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -march=armv4t -mtune=arm7tdmi-s -mlong-calls \ -msoft-float -mthumb-interwork -fno-strict-aliasing -fno-common \ -ffixed-r8 -ffunction-sections -ffreestanding -fno-builtin \ diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index 343d74140878b5aaf0ff78badf91a867f99c7584..8d72d2ffc4c9a2ccaebe3d5d62f38a087308ad06 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -4,9 +4,9 @@ export CPU = msp430x16x export MCU = msp430f1611 # toolchain config -export PREFIX = @msp430- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = msp430- +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU) export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2 export AS = $(PREFIX)as diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index dadc60bc65bdd61908f62e80399cc5f15689d641..4ecffabafabb0495a38ebab3371fba10530f1071 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -3,9 +3,9 @@ export CPU = msp430x16x export MCU = msp430f1611 # toolchain config -export PREFIX = @msp430- -export CC = @$(PREFIX)gcc -export AR = @$(PREFIX)ar +export PREFIX = msp430- +export CC = $(PREFIX)gcc +export AR = $(PREFIX)ar export CFLAGS += -std=gnu99 -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU) export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2 export AS = $(PREFIX)as diff --git a/cpu/native/Makefile b/cpu/native/Makefile index d8e6b930b18d4de01fae1bc61fd559277e656d2f..a6f241ddcede8d67eb972336467eb2fa518d69c5 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -16,7 +16,7 @@ all: $(BINDIR)$(MODULE).a include $(RIOTBASE)/Makefile.base $(BINDIR)%.o: %.c - $(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o + $(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(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 diff --git a/dist/Makefile b/dist/Makefile index 22423602cbd290bedbda68d9b05c3f20980e6c70..36e93b9795780002a91df0528137b00b4ec5afa8 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -35,4 +35,12 @@ export RIOTBASE =$(CURDIR)/../../RIOT export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/ +QUITE := 1 +ifeq($(QUITE),1) + AD=@ +else + AD= +endif +export AD + include $(RIOTBASE)/Makefile.include diff --git a/sys/shell/Makefile b/sys/shell/Makefile index 0b5b6d05e12659d885a596fbec375b8c6fbbed27..9dbd84c1b949045d814cc7c7d0b0befb952ab4a2 100644 --- a/sys/shell/Makefile +++ b/sys/shell/Makefile @@ -12,7 +12,7 @@ $(BINDIR)$(MODULE).a: $(OBJ) # compile and generate dependency info $(BINDIR)%.o: %.c - @$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o @$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d