clean up QUIET

This commit is contained in:
hathach 2020-03-25 14:16:24 +07:00
parent b91a76a16e
commit 98271c9f56

View File

@ -302,12 +302,6 @@ $(info ASFLAGS $(ASFLAGS))
$(info ) $(info )
endif endif
ifeq ("$(V)","2")
QUIET =
else
QUIET = @
endif
.phony: all clean size flash sd erase .phony: all clean size flash sd erase
# default target to build # default target to build
@ -358,21 +352,21 @@ clean:
# Create objects from C SRC files # Create objects from C SRC files
$(BUILD)/%.o: %.c $(BUILD)/%.o: %.c
@echo CC $(notdir $<) @echo CC $(notdir $<)
$(QUIET)$(CC) $(CFLAGS) $(INC_PATHS) -c -o $@ $< @$(CC) $(CFLAGS) $(INC_PATHS) -c -o $@ $<
# Assemble files # Assemble files
$(BUILD)/%.o: %.S $(BUILD)/%.o: %.S
@echo AS $(notdir $<) @echo AS $(notdir $<)
$(QUIET)$(CC) -x assembler-with-cpp $(ASFLAGS) $(INC_PATHS) -c -o $@ $< @$(CC) -x assembler-with-cpp $(ASFLAGS) $(INC_PATHS) -c -o $@ $<
# Link # Link
$(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS) $(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS)
@echo LD $(OUT_FILE)-nosd.out @echo LD $(OUT_FILE)-nosd.out
$(QUIET)$(CC) -o $@ $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group @$(CC) -o $@ $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group
size: $(BUILD)/$(OUT_FILE)-nosd.out size: $(BUILD)/$(OUT_FILE)-nosd.out
-@echo '' -@echo ''
$(QUIET)$(SIZE) $< @$(SIZE) $<
-@echo '' -@echo ''
@ -384,7 +378,7 @@ genhex: $(BUILD)/$(OUT_FILE)-nosd.hex
$(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE)-nosd.out $(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE)-nosd.out
@echo CR $(OUT_FILE)-nosd.hex @echo CR $(OUT_FILE)-nosd.hex
$(QUIET)$(OBJCOPY) -O ihex $< $@ @$(OBJCOPY) -O ihex $< $@
# merge bootloader and sd hex together # merge bootloader and sd hex together
combinehex: $(BUILD)/$(MERGED_FILE).hex combinehex: $(BUILD)/$(MERGED_FILE).hex