diff --git a/Makefile b/Makefile index 80b90568cb1901c35ec40ca4e89f32958faaad86..0b0bd7b57b54e19fb7688355e9c7f0c3f2cf062f 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,19 @@ ## ## Makefile for Miosix embedded OS ## -MAKEFILE_VERSION := 1.06 +MAKEFILE_VERSION := 1.07 ## Path to kernel directory (edited by init_project_out_of_git_repo.pl) KPATH := miosix ## Path to config directory (edited by init_project_out_of_git_repo.pl) CONFPATH := $(KPATH) include $(CONFPATH)/config/Makefile.inc -ifeq ("$(BUILD_VERBOSE)","1") -Q := @ -ECHO := @echo -else +ifeq ("$(VERBOSE)","1") Q := ECHO := @true +else +Q := @ +ECHO := @echo endif ## @@ -82,24 +82,26 @@ clean-topdir: -rm -f $(OBJ) main.elf main.hex main.bin main.map $(OBJ:.o=.d) main: main.elf - $(CP) -O ihex main.elf main.hex - $(CP) -O binary main.elf main.bin - $(SZ) main.elf + $(ECHO) "[CP ] main.hex" + $(Q)$(CP) -O ihex main.elf main.hex + $(ECHO) "[CP ] main.bin" + $(Q)$(CP) -O binary main.elf main.bin + $(Q)$(SZ) main.elf main.elf: $(OBJ) all-recursive - $(ECHO) "[LD] main.elf" + $(ECHO) "[LD ] main.elf" $(Q)$(CXX) $(LFLAGS) -o main.elf $(OBJ) $(KPATH)/$(BOOT_FILE) $(LINK_LIBS) %.o: %.s - $(ECHO) "[AS] $<" + $(ECHO) "[AS ] $<" $(Q)$(AS) $(AFLAGS) $< -o $@ %.o : %.c - $(ECHO) "[CC] $<" + $(ECHO) "[CC ] $<" $(Q)$(CC) $(DFLAGS) $(CFLAGS) $< -o $@ %.o : %.cpp - $(ECHO) "[CXX] $<" + $(ECHO) "[CXX ] $<" $(Q)$(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ #pull in dependecy info for existing .o files diff --git a/miosix/Makefile b/miosix/Makefile index 6156fa0ce514b5c6cb6034d8f18ee55379027624..d5b65fac5459db4a06d1786ea9a0ccc2ff3bf56e 100644 --- a/miosix/Makefile +++ b/miosix/Makefile @@ -2,11 +2,11 @@ ## Makefile for Miosix embedded OS ## This makefile builds the whole kernel ## -MAKEFILE_VERSION := 1.06 +MAKEFILE_VERSION := 1.07 ## KPATH and CONFPATH are forwarded by the parent Makefile include $(CONFPATH)/config/Makefile.inc -ifeq ("$(BUILD_VERBOSE)","1") +ifeq ("$(VERBOSE)","1") Q := ECHO := @true else @@ -74,7 +74,7 @@ DFLAGS := -MMD -MP all: $(OBJ) $(BOOT_FILE) $(ECHO) "[PERL] Checking global objects" $(Q)perl _tools/check_global_objects.pl $(OBJ) - $(ECHO) "[AR] libmiosix.a" + $(ECHO) "[AR ] libmiosix.a" $(Q)$(AR) rcs libmiosix.a $(OBJ) clean: @@ -82,15 +82,15 @@ clean: -rm -f $(BOOT_FILE:.o=.d) %.o: %.s - $(ECHO) "[AS] $<" + $(ECHO) "[AS ] $<" $(Q)$(AS) $(AFLAGS) $< -o $@ %.o : %.c - $(ECHO) "[CC] $<" + $(ECHO) "[CC ] $<" $(Q)$(CC) $(DFLAGS) $(CFLAGS) $< -o $@ %.o : %.cpp - $(ECHO) "[CXX] $<" + $(ECHO) "[CXX ] $<" $(Q)$(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ #pull in dependecy info for existing .o files diff --git a/miosix/_doc/textdoc/Changelog.txt b/miosix/_doc/textdoc/Changelog.txt index 4b5351b88a533801f67b197578eca69dd18b0a71..10aed188e3f3156e6cfb3cae7f389d329b43ee1b 100644 --- a/miosix/_doc/textdoc/Changelog.txt +++ b/miosix/_doc/textdoc/Changelog.txt @@ -2,6 +2,9 @@ Changelog for Miosix np embedded OS v2.01 +- Committed patch from Alain <carpikemail@gmail.com> to make build output more + readable. Detailed compiler options are still available building with + "make VERBOSE=1" - Fixed bug in intrusive.h which caused compiler errors when building with exceptions and RTTI disabled - Added new board: stm32f411re_nucleo diff --git a/miosix/_examples/sad_trombone/Makefile b/miosix/_examples/sad_trombone/Makefile index b356b0a42ed36bf3d986177f1d2c72f7455a6098..d2bda92f94ae796e4b4e2fa5440f74949336aeb3 100644 --- a/miosix/_examples/sad_trombone/Makefile +++ b/miosix/_examples/sad_trombone/Makefile @@ -1,13 +1,21 @@ ## ## Makefile for Miosix embedded OS ## -MAKEFILE_VERSION := 1.06 +MAKEFILE_VERSION := 1.07 ## Path to kernel directory (edited by init_project_out_of_git_repo.pl) KPATH := miosix ## Path to config directory (edited by init_project_out_of_git_repo.pl) CONFPATH := $(KPATH) include $(CONFPATH)/config/Makefile.inc +ifeq ("$(VERBOSE)","1") +Q := +ECHO := @true +else +Q := @ +ECHO := @echo +endif + ## ## List here subdirectories which contains makefiles ## @@ -74,22 +82,27 @@ clean-topdir: -rm -f $(OBJ) main.elf main.hex main.bin main.map $(OBJ:.o=.d) main: main.elf - $(CP) -O ihex main.elf main.hex - $(CP) -O binary main.elf main.bin - $(SZ) main.elf + $(ECHO) "[CP ] main.hex" + $(Q)$(CP) -O ihex main.elf main.hex + $(ECHO) "[CP ] main.bin" + $(Q)$(CP) -O binary main.elf main.bin + $(Q)$(SZ) main.elf main.elf: $(OBJ) all-recursive - @ echo "linking" - $(CXX) $(LFLAGS) -o main.elf $(OBJ) $(KPATH)/$(BOOT_FILE) $(LINK_LIBS) + $(ECHO) "[LD ] main.elf" + $(Q)$(CXX) $(LFLAGS) -o main.elf $(OBJ) $(KPATH)/$(BOOT_FILE) $(LINK_LIBS) %.o: %.s - $(AS) $(AFLAGS) $< -o $@ + $(ECHO) "[AS ] $<" + $(Q)$(AS) $(AFLAGS) $< -o $@ %.o : %.c - $(CC) $(DFLAGS) $(CFLAGS) $< -o $@ + $(ECHO) "[CC ] $<" + $(Q)$(CC) $(DFLAGS) $(CFLAGS) $< -o $@ %.o : %.cpp - $(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ + $(ECHO) "[CXX ] $<" + $(Q)$(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ #pull in dependecy info for existing .o files -include $(OBJ:.o=.d) diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc index abe85c8fc80f16b4eb6cab2caa405cec13f59584..106bfe36c45b8bb5b2e039999df4fa7eb2baa9c4 100644 --- a/miosix/config/Makefile.inc +++ b/miosix/config/Makefile.inc @@ -331,7 +331,7 @@ endif ## a new board or porting Miosix to a new architecture ## ############################################################################ -ifneq ($(MAKEFILE_VERSION),1.06) +ifneq ($(MAKEFILE_VERSION),1.07) $(info You are using an incompatible makefile. Make sure it matches \ the one distributed with the current version of the kernel) $(error Error)