From 8ce6bf82a91e44360167d297e684f29749dd6f26 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Sat, 13 Jun 2020 18:39:17 +0300 Subject: [PATCH] Minimize make info noise during building --- Makefile | 13 ++++++++----- modules/hekate_libsys_lp0/Makefile | 4 ++-- modules/hekate_libsys_minerva/Makefile | 4 ++-- modules/simple_sample/Makefile | 4 ++-- nyx/Makefile | 12 ++++++++---- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 63e825c..05c74cb 100755 --- a/Makefile +++ b/Makefile @@ -89,23 +89,26 @@ clean: @rm -rf $(OUTPUTDIR) $(MODULEDIRS): - $(MAKE) -C $@ $(MAKECMDGOALS) -$(MAKEFLAGS) + @$(MAKE) -C $@ $(MAKECMDGOALS) -$(MAKEFLAGS) $(NYXDIR): - $(MAKE) -C $@ $(MAKECMDGOALS) -$(MAKEFLAGS) + @$(MAKE) -C $@ $(MAKECMDGOALS) -$(MAKEFLAGS) $(TARGET).bin: $(BUILDDIR)/$(TARGET)/$(TARGET).elf $(MODULEDIRS) $(NYXDIR) $(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$@ @printf ICTC49 >> $(OUTPUTDIR)/$@ $(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS) - $(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@ + @$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@ + @echo "hekate was built with the following flags:\nCFLAGS: "$(CFLAGS)"\nLDFLAGS: "$(LDFLAGS) $(BUILDDIR)/$(TARGET)/%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ + @echo Building $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(BUILDDIR)/$(TARGET)/%.o: %.S - $(CC) $(CFLAGS) -c $< -o $@ + @echo Building $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(OBJS): $(BUILDDIR)/$(TARGET) diff --git a/modules/hekate_libsys_lp0/Makefile b/modules/hekate_libsys_lp0/Makefile index 139db53..1ba643b 100644 --- a/modules/hekate_libsys_lp0/Makefile +++ b/modules/hekate_libsys_lp0/Makefile @@ -21,10 +21,10 @@ LDFLAGS = $(ARCH) -fpie -pie -nostartfiles -lgcc all: $(TARGET).bso $(BUILD)/%.o: ./%.c @mkdir -p "$(BUILD)" - $(CC) $(CFLAGS) -c $< -o $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(TARGET).bso: $(OBJS) - $(CC) $(LDFLAGS) -e _modInit $^ -o $(OUTPUT)/$(TARGET).bso + @$(CC) $(LDFLAGS) -e _modInit $^ -o $(OUTPUT)/$(TARGET).bso $(STRIP) -g $(OUTPUT)/$(TARGET).bso clean: diff --git a/modules/hekate_libsys_minerva/Makefile b/modules/hekate_libsys_minerva/Makefile index 47edb59..e6b5924 100644 --- a/modules/hekate_libsys_minerva/Makefile +++ b/modules/hekate_libsys_minerva/Makefile @@ -21,10 +21,10 @@ LDFLAGS = $(ARCH) -fpie -pie -nostartfiles -lgcc all: $(TARGET).bso $(BUILD)/%.o: ./%.c @mkdir -p "$(BUILD)" - $(CC) $(CFLAGS) -c $< -o $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(TARGET).bso: $(OBJS) - $(CC) $(LDFLAGS) -e _minerva_init $^ -o $(OUTPUT)/$(TARGET).bso + @$(CC) $(LDFLAGS) -e _minerva_init $^ -o $(OUTPUT)/$(TARGET).bso $(STRIP) -g $(OUTPUT)/$(TARGET).bso clean: diff --git a/modules/simple_sample/Makefile b/modules/simple_sample/Makefile index 2a52896..cc07b1c 100644 --- a/modules/simple_sample/Makefile +++ b/modules/simple_sample/Makefile @@ -23,10 +23,10 @@ LDFLAGS = $(ARCH) -fpie -pie -nostartfiles -lgcc all: $(TARGET).bso $(BUILD)/%.o: ./%.c @mkdir -p "$(BUILD)" - $(CC) $(CFLAGS) -c $< -o $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(TARGET).bso: $(OBJS) - $(CC) $(LDFLAGS) -e _modInit $^ -o $(OUTPUT)/$(TARGET).bso + @$(CC) $(LDFLAGS) -e _modInit $^ -o $(OUTPUT)/$(TARGET).bso $(STRIP) -g $(OUTPUT)/$(TARGET).bso clean: diff --git a/nyx/Makefile b/nyx/Makefile index 476532a..a2ee009 100644 --- a/nyx/Makefile +++ b/nyx/Makefile @@ -70,8 +70,9 @@ OBJS += $(addprefix $(BUILDDIR)/$(TARGET)/, \ ################################################################################ -CUSTOMDEFINES += -DNYX_LOAD_ADDR=$(NYX_LOAD_ADDR) -DNYX_MAGIC=$(NYX_MAGIC) +CUSTOMDEFINES := -DNYX_LOAD_ADDR=$(NYX_LOAD_ADDR) -DNYX_MAGIC=$(NYX_MAGIC) CUSTOMDEFINES += -DNYX_VER_MJ=$(NYXVERSION_MAJOR) -DNYX_VER_MN=$(NYXVERSION_MINOR) -DNYX_VER_HF=$(NYXVERSION_HOTFX) -DNYX_RESERVED=$(NYXVERSION_RSVD) +CUSTOMDEFINES += -DNYX # 0: UART_A, 1: UART_B. #CUSTOMDEFINES += -DDEBUG_UART_PORT=1 @@ -100,13 +101,16 @@ $(TARGET).bin: $(BUILDDIR)/$(TARGET)/$(TARGET).elf $(OBJCOPY) -S -O binary $< $(OUTPUTDIR)/$@ $(BUILDDIR)/$(TARGET)/$(TARGET).elf: $(OBJS) - $(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@ + @$(CC) $(LDFLAGS) -T $(SOURCEDIR)/link.ld $^ -o $@ + @echo "Nyx was built with the following flags:\nCFLAGS: "$(CFLAGS)"\nLDFLAGS: "$(LDFLAGS) $(BUILDDIR)/$(TARGET)/%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ + @echo Building $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(BUILDDIR)/$(TARGET)/%.o: %.S - $(CC) $(CFLAGS) -c $< -o $@ + @echo Building $@ + @$(CC) $(CFLAGS) -c $< -o $@ $(OBJS): $(BUILDDIR)/$(TARGET)