aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2015-03-07 10:32:52 -0800
committerGareth McMullin2015-03-07 11:03:50 -0800
commit0d99e22a26599f03ac8243c61799d7be3351ece0 (patch)
tree5dcfbd6de51759db3df559d6f706d2b66ef7f68f
parent1eac78b1c8bd8096c7a8c4c175119f47924cbb6e (diff)
Quieten build system.
-rw-r--r--Makefile17
-rw-r--r--src/Makefile31
-rw-r--r--src/platforms/f4discovery/Makefile.inc2
-rw-r--r--src/platforms/native/Makefile.inc6
-rw-r--r--src/platforms/stlink/Makefile.inc8
-rw-r--r--src/platforms/swlink/Makefile.inc5
6 files changed, 45 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 5a8365e..358c687 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,18 @@
+ifneq ($(V), 1)
+MFLAGS += --no-print-dir
+Q := @
+endif
+
all:
- @if [ ! -f libopencm3/Makefile ]; then \
+ $(Q)if [ ! -f libopencm3/Makefile ]; then \
echo "Initialising git submodules..." ;\
git submodule init ;\
git submodule update ;\
fi
- $(MAKE) -C libopencm3 lib
- $(MAKE) -C src
+ $(Q)$(MAKE) $(MFLAGS) -C libopencm3 lib
+ $(Q)$(MAKE) $(MFLAGS) -C src
-%:
- $(MAKE) -C libopencm3 $@
- $(MAKE) -C src $@
+clean:
+ $(Q)$(MAKE) $(MFLAGS) -C libopencm3 $@
+ $(Q)$(MAKE) $(MFLAGS) -C src $@
diff --git a/src/Makefile b/src/Makefile
index 5295576..2d3e6b7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,6 +2,11 @@ PROBE_HOST ?= native
PLATFORM_DIR = platforms/$(PROBE_HOST)
VPATH += platforms/common $(PLATFORM_DIR)
+ifneq ($(V), 1)
+MAKEFLAGS += --no-print-dir
+Q := @
+endif
+
BUILDDATE := `date +"%Y%m%d"`
CFLAGS += -Wall -Wextra -Wno-pointer-sign -Wno-char-subscripts\
@@ -45,29 +50,37 @@ include $(PLATFORM_DIR)/Makefile.inc
OBJ = $(SRC:.c=.o)
blackmagic: $(OBJ)
- $(CC) -o $@ $^ $(LDFLAGS)
+ @echo " LD $@"
+ $(Q)$(CC) -o $@ $^ $(LDFLAGS)
+
+%.o: %.c
+ @echo " CC $<"
+ $(Q)$(CC) $(CFLAGS) -c $< -o $@
%.bin: %
- $(OBJCOPY) -O binary $^ $@
+ @echo " OBJCOPY $@"
+ $(Q)$(OBJCOPY) -O binary $^ $@
%.hex: %
- $(OBJCOPY) -O ihex $^ $@
+ @echo " OBJCOPY $@"
+ $(Q)$(OBJCOPY) -O ihex $^ $@
.PHONY: clean host_clean all_platforms
clean: host_clean
- -$(RM) *.o *.d *~ blackmagic $(HOSTFILES)
- -$(RM) platforms/*/*.o platforms/*/*.d mapfile
+ $(Q)echo " CLEAN"
+ -$(Q)$(RM) -f *.o *.d *~ blackmagic $(HOSTFILES)
+ -$(Q)$(RM) -f platforms/*/*.o platforms/*/*.d mapfile
all_platforms:
- set -e ;\
+ $(Q)set -e ;\
for i in platforms/*/Makefile.inc ; do \
export DIRNAME=`dirname $$i` ;\
export PROBE_HOST=`basename $$DIRNAME` ;\
export CFLAGS=-Werror ;\
- echo $$PROBE_HOST ;\
- $(MAKE) clean ;\
- $(MAKE) ;\
+ echo "Building for hardware platform: $$PROBE_HOST" ;\
+ $(MAKE) $(MAKEFLAGS) clean ;\
+ $(MAKE) $(MAKEFLAGS);\
if [ -f blackmagic.bin ]; then \
mv blackmagic.bin blackmagic-$$PROBE_HOST.bin ;\
fi ;\
diff --git a/src/platforms/f4discovery/Makefile.inc b/src/platforms/f4discovery/Makefile.inc
index 01b3f61..e2bebfd 100644
--- a/src/platforms/f4discovery/Makefile.inc
+++ b/src/platforms/f4discovery/Makefile.inc
@@ -25,4 +25,4 @@ SRC += cdcacm.c \
all: blackmagic.bin
host_clean:
- -rm blackmagic.bin
+ -$(Q)$(RM) blackmagic.bin
diff --git a/src/platforms/native/Makefile.inc b/src/platforms/native/Makefile.inc
index b5c5c33..6ec60b1 100644
--- a/src/platforms/native/Makefile.inc
+++ b/src/platforms/native/Makefile.inc
@@ -24,9 +24,9 @@ SRC += cdcacm.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o
- $(CC) $^ -o $@ $(LDFLAGS_BOOT)
-
+ @echo " LD $@"
+ $(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT)
host_clean:
- -rm blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex
+ -$(Q)$(RM) -f blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex
diff --git a/src/platforms/stlink/Makefile.inc b/src/platforms/stlink/Makefile.inc
index 5b2e61f..40635cf 100644
--- a/src/platforms/stlink/Makefile.inc
+++ b/src/platforms/stlink/Makefile.inc
@@ -23,11 +23,13 @@ SRC += cdcacm.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade.bin dfu_upgrade.hex
blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o
- $(CC) $^ -o $@ $(LDFLAGS_BOOT)
+ @echo " LD $@"
+ $(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT)
dfu_upgrade: dfu_upgrade.o dfucore.o dfu_f1.o
- $(CC) $^ -o $@ $(LDFLAGS)
+ @echo " LD $@"
+ $(Q)$(CC) $^ -o $@ $(LDFLAGS)
host_clean:
- -rm blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade dfu_upgrade.bin dfu_upgrade.hex
+ -$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade dfu_upgrade.bin dfu_upgrade.hex
diff --git a/src/platforms/swlink/Makefile.inc b/src/platforms/swlink/Makefile.inc
index c415ecd..ca793d4 100644
--- a/src/platforms/swlink/Makefile.inc
+++ b/src/platforms/swlink/Makefile.inc
@@ -23,8 +23,9 @@ SRC += cdcacm.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o
- $(CC) $^ -o $@ $(LDFLAGS_BOOT)
+ @echo " LD $@"
+ $(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT)
host_clean:
- -rm blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex
+ -$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex