comparison Makefile @ 548:3980b707634d prerelease

Added makefile command line options

 # Bela
 # Low-latency, real-time audio and sensor processing on BeagleBone Black
 # (c) 2016 Andrew McPherson, Victor Zappi, Giulio Moro, Liam Donovan
 # Centre for Digital Music, Queen Mary University of London
 
-# This Makefile is intended for use on the BeagleBone Black itself
-# and not for cross-compiling
-
+## This Makefile is intended for use on the BeagleBone Black itself #
+## and not for cross-compiling #
+## available command line options: #
+## EXAMPLE=             -- name of the folder in examples/ to be copied to projects/ and built
+## PROJECT=             -- name of the folder in projects/ to be built
+## CL=                  -- list of command line options to pass to the program when running
+## INCLUDES=            -- list of additional include paths to pass to the compiler
+## CPP_FLAGS=           -- list of additional flags passed to the C++ compiler
+## C_FLAGS=             -- list of additional flags passed to the C compiler
+## COMPILER=            -- compiler to use (clang or gcc)
+## LIBS=                -- libs to link in
+## AT=                  -- used instead of @ to silence the output. Defaults AT=@, use AT= for a very verbose output
+###
+##available targets: #
 .DEFAULT_GOAL := Bela
 
+AT?=@
 NO_PROJECT_TARGETS=help coreclean distclean stop nostartup idestart idestop idestartup idenostartup connect ideconnect update checkupdate updateunsafe
 NO_PROJECT_TARGETS_MESSAGE=PROJECT or EXAMPLE should be set for all targets except: $(NO_PROJECT_TARGETS)
 # list of targets that automatically activate the QUIET=true flag
 QUIET_TARGETS=runide
 
 # Type `$ make help` to get a description of the functionalities of this Makefile.
 help: ## Show this help
-	@echo 'Usage: make [target] CL=[command line options] [PROJECT=[projectName] | EXAMPLE=[exampleName]]'
-	@printf "\n$(NO_PROJECT_TARGETS_MESSAGE)\n\n"
-	@echo 'Targets: (default: $(.DEFAULT_GOAL))'
-	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e  's/^\(.*\): .*##\(.*\)/\1:#\2/' | column -t -c 2 -s '#'
+	$(AT) echo 'Usage: make [target] CL=[command line options] [PROJECT=[projectName] | EXAMPLE=[exampleName]]'
+	$(AT) printf "\n$(NO_PROJECT_TARGETS_MESSAGE)\n\n"
+	$(AT) echo 'Targets: (default: $(.DEFAULT_GOAL))'
+	$(AT) echo list: $(MAKEFILE_LIST)
+	$(AT) fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/^\(.*\): .*##\(.*\)/\1:#\2/' | sed -e 's/^\(.*\)= .* -- \(.*\)/\1=#\2/' | sed 's/^##//' | awk -F"#" '{ printf "%-18s %-1s\n", $$1, $$2}' 
 
 # PROJECT or EXAMPLE must be set for targets that are not included in NO_PROJECT_TARGETS
 ifeq (,$(filter $(NO_PROJECT_TARGETS),$(MAKECMDGOALS)))
   ifndef PROJECT
     ifndef EXAMPLE

 endif
 QUIET?=false
 
 RM := rm -rf
 STATIC_LIBS := ./libprussdrv.a ./libNE10.a
-LIBS := -lrt -lnative -lxenomai -lsndfile
+override LIBS += -lrt -lnative -lxenomai -lsndfile
 
 # refresh library cache and check if libpd is there
 #TEST_LIBPD := $(shell ldconfig; ldconfig -p | grep "libpd\.so")  # safest but slower way of checking
 LIBPD_PATH = /usr/lib/libpd.so
 TEST_LIBPD := $(shell which $(LIBPD_PATH))
 ifneq ($(strip $(TEST_LIBPD)), )
 # if libpd is there, link it in
   LIBS += -lpd -lpthread_rt
 endif
-
-CPP_FLAGS := -O3 -march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon -ftree-vectorize 
-C_FLAGS := $(CPP_FLAGS)
+DEFAULT_CPP_FLAGS := -O3 -march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon -ftree-vectorize 
+override CPP_FLAGS := $(DEFAULT_CPP_FLAGS) $(CPP_FLAGS)
+override C_FLAGS := $(DEFAULT_CPP_FLAGS) $(C_FLAGS)
+
 
 ifndef COMPILER
 # check whether clang is installed
   TEST_COMPILER := $(shell which clang)
   ifneq ($(strip $(TEST_COMPILER)), )

 ifeq ($(COMPILER), clang)
   CC=clang
   CXX=clang++
   CPP_FLAGS += -DNDEBUG 
   C_FLAGS += -DNDEBUG
-else
-  CC=gcc
-  CXX=g++
-  CPP_FLAGS += --fast-math
-  C_FLAGS += --fast-math
-endif
-
-INCLUDES := -I$(PROJECT_DIR) -I./include -I/usr/include/ne10 -I/usr/xenomai/include -I/usr/arm-linux-gnueabihf/include/xenomai/include -I/usr/arm-linux-gnueabihf/include/ne10
+else 
+  ifeq ($(COMPILER), gcc)
+    CC=gcc
+    CXX=g++
+    CPP_FLAGS += --fast-math
+    C_FLAGS += --fast-math
+  endif
+endif
+
+DEFAULT_INCLUDES := -I$(PROJECT_DIR) -I./include -I/usr/include/ne10 -I/usr/xenomai/include -I/usr/arm-linux-gnueabihf/include/xenomai/include -I/usr/arm-linux-gnueabihf/include/ne10
+override INCLUDES += $(DEFAULT_INCLUDES)
 
 ASM_SRCS := $(wildcard $(PROJECT_DIR)/*.S)
 ASM_OBJS := $(addprefix $(PROJECT_DIR)/build/,$(notdir $(ASM_SRCS:.S=.o)))
 ASM_DEPS := $(addprefix $(PROJECT_DIR)/build/,$(notdir $(ASM_SRCS:.S=.d)))
 

 syntax: SYNTAX_FLAG := -fsyntax-only
 syntax: $(PROJECT_OBJS) 
 
 # Rule for Bela core C++ files
 build/core/%.o: ./core/%.cpp
-	@echo 'Building $(notdir $<)...'
-#	@echo 'Invoking: C++ Compiler $(CXX)'
-	@$(CXX) $(SYNTAX_FLAG) $(INCLUDES) $(CPP_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo ' ...done'
-	@echo ' '
+	$(AT) echo 'Building $(notdir $<)...'
+#	$(AT) echo 'Invoking: C++ Compiler $(CXX)'
+	$(AT) $(CXX) $(SYNTAX_FLAG) $(INCLUDES) $(CPP_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	$(AT) echo ' ...done'
+	$(AT) echo ' '
 
 # Rule for Bela core ASM files
 build/core/%.o: ./core/%.S
-	@echo 'Building $(notdir $<)...'
-#	@echo 'Invoking: GCC Assembler'
-	@as  -o "$@" "$<"
-	@echo ' ...done'
-	@echo ' '
+	$(AT) echo 'Building $(notdir $<)...'
+#	$(AT) echo 'Invoking: GCC Assembler'
+	$(AT) as  -o "$@" "$<"
+	$(AT) echo ' ...done'
+	$(AT) echo ' '
 
 # Rule for user-supplied C++ files
 $(PROJECT_DIR)/build/%.o: $(PROJECT_DIR)/%.cpp
-	@echo 'Building $(notdir $<)...'
-#	@echo 'Invoking: C++ Compiler $(CXX)'
-	@$(CXX) $(SYNTAX_FLAG) $(INCLUDES) $(CPP_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo ' ...done'
-	@echo ' '
+	$(AT) echo 'Building $(notdir $<)...'
+#	$(AT) echo 'Invoking: C++ Compiler $(CXX)'
+	$(AT) $(CXX) $(SYNTAX_FLAG) $(INCLUDES) $(CPP_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	$(AT) echo ' ...done'
+	$(AT) echo ' '
 
 # Rule for user-supplied C files
 $(PROJECT_DIR)/build/%.o: $(PROJECT_DIR)/%.c
-	@echo 'Building $(notdir $<)...'
-#	@echo 'Invoking: C Compiler $(CC)'
-	@$(CC) $(SYNTAX_FLAG) $(INCLUDES) $(C_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" -std=c99 
-	@echo ' ...done'
-	@echo ' '
+	$(AT) echo 'Building $(notdir $<)...'
+#	$(AT) echo 'Invoking: C Compiler $(CC)'
+	$(AT) $(CC) $(SYNTAX_FLAG) $(INCLUDES) $(C_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" -std=c99 
+	$(AT) echo ' ...done'
+	$(AT) echo ' '
 
 # Rule for user-supplied assembly files
 $(PROJECT_DIR)/build/%.o: $(PROJECT_DIR)/%.S
-	@echo 'Building $(notdir $<)...'
-#	@echo 'Invoking: GCC Assembler'
-	@as  -o "$@" "$<"
-	@echo ' ...done'
-	@echo ' '
+	$(AT) echo 'Building $(notdir $<)...'
+#	$(AT) echo 'Invoking: GCC Assembler'
+	$(AT) as  -o "$@" "$<"
+	$(AT) echo ' ...done'
+	$(AT) echo ' '
 
 # This is a nasty kludge: we want to be able to optionally link in a default
 # main file if the user hasn't supplied one. We check for the presence of the main()
 # function, and conditionally call one of two recursive make targets depending on whether
 # we want to link in the default main file or not. The kludge is the mess of a shell script
 # line below. Surely there's a better way to do this?
 $(OUTPUT_FILE): $(CORE_ASM_OBJS) $(CORE_OBJS) $(PROJECT_OBJS) $(STATIC_LIBS) $(DEFAULT_MAIN_OBJS) $(DEFAULT_PD_OBJS)
 	$(eval DEFAULT_MAIN_CONDITIONAL :=\
 	    $(shell bash -c '[ `nm $(PROJECT_OBJS) 2>/dev/null | grep -w T | grep -w main | wc -l` == '0' ] && echo "$(DEFAULT_MAIN_OBJS)" || : '))
-	@#If there is a .pd file AND there is no "render" symbol then link in the $(DEFAULT_PD_OBJS) 
+	$(AT) #If there is a .pd file AND there is no "render" symbol then link in the $(DEFAULT_PD_OBJS) 
 	$(eval DEFAULT_PD_CONDITIONAL :=\
 	    $(shell bash -c '{ ls $(PROJECT_DIR)/*.pd &>/dev/null && [ `nm $(PROJECT_OBJS) 2>/dev/null | grep -w T | grep "render.*BelaContext" | wc -l` -eq 0 ]; } && echo '$(DEFAULT_PD_OBJS)' || : ' ))
-	@echo 'Linking...'
-	@$(CXX) $(SYNTAX_FLAG) -L/usr/xenomai/lib -L/usr/arm-linux-gnueabihf/lib -L/usr/arm-linux-gnueabihf/lib/xenomai -L/usr/lib/arm-linux-gnueabihf -pthread -Wpointer-arith -o "$(PROJECT_DIR)/$(PROJECT)" $(CORE_ASM_OBJS) $(CORE_OBJS) $(DEFAULT_MAIN_CONDITIONAL) $(DEFAULT_PD_CONDITIONAL) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(LIBS)
-	@echo ' ...done'
+	$(AT) echo 'Linking...'
+	$(AT) $(CXX) $(SYNTAX_FLAG) $(LDFLAGS) -L/usr/xenomai/lib -L/usr/arm-linux-gnueabihf/lib -L/usr/arm-linux-gnueabihf/lib/xenomai -L/usr/lib/arm-linux-gnueabihf -pthread -Wpointer-arith -o "$(PROJECT_DIR)/$(PROJECT)" $(CORE_ASM_OBJS) $(CORE_OBJS) $(DEFAULT_MAIN_CONDITIONAL) $(DEFAULT_PD_CONDITIONAL) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(LIBS)
+	$(AT) echo ' ...done'
 	
 # Other Targets:
-projectclean:## Remove the PROJECT's build objects & binary
+projectclean: ## Remove the PROJECT's build objects & binary
 	-$(RM) $(PROJECT_DIR)/build/* $(OUTPUT_FILE)
 	-@echo ' '	
 
 clean: ## Same as projectclean
 clean: projectclean
 
 coreclean: ## Remove the core's build objects
 	-$(RM) build/core/*
 
 prompt:
-	@printf "Warning: you are about to DELETE the projects/ folder and its content. This operation cannot be undone. Continue? (y/N) "
-	@read REPLY; if [ $$REPLY !=  y ] && [ $$REPLY != Y ]; then echo "Aborting..."; exit 1; fi
+	$(AT) printf "Warning: you are about to DELETE the projects/ folder and its content. This operation cannot be undone. Continue? (y/N) "
+	$(AT) read REPLY; if [ $$REPLY !=  y ] && [ $$REPLY != Y ]; then echo "Aborting..."; exit 1; fi
 	
 distclean: ## Restores the Bela folder to a pristine state: remove all the projects source and the built objects, including the core Bela objects.
 distclean: prompt distcleannoprompt
 	
 distcleannoprompt: ## Same as distclean, but does not prompt for confirmation. Use with care.
 	-$(RM) build/source/* $(CORE_OBJS) $(CORE_CPP_DEPS) $(DEFAULT_MAIN_OBJS) $(DEFAULT_MAIN_CPP_DEPS) $(OUTPUT_FILE)
 	-@echo ' '
 
+$(warning C_FLAGS $(C_FLAGS))
+$(warning CPP_FLAGS $(CPP_FLAGS))
+$(warning LIBS $(LIBS))
+$(warning INCLUDES $(INCLUDES))
 runfg: run
 run: ## Run PROJECT in the foreground
 run: stop Bela
-	@echo "Running $(RUN_COMMAND)"
-	@sync& cd $(RUN_FROM) && $(RUN_COMMAND)
+	$(AT) echo "Running $(RUN_COMMAND)"
+	$(AT) sync& cd $(RUN_FROM) && $(RUN_COMMAND)
 runide: ## Run PROJECT for IDE (foreground, no buffering)
 runide: stop Bela
-	@sync& cd $(RUN_FROM) && $(RUN_IDE_COMMAND)
+	$(AT) sync& cd $(RUN_FROM) && $(RUN_IDE_COMMAND)
 runscreen: ## Run PROJECT in the background (detached screen)
 runscreen: stop $(OUTPUT_FILE)
-	@echo "Running $(RUN_COMMAND) in a screen"
-	@cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -d -m $(RUN_COMMAND)
+	$(AT) echo "Running $(RUN_COMMAND) in a screen"
+	$(AT) cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -d -m $(RUN_COMMAND)
 runscreenfg: ## Run PROJECT in a screen in the foreground (can detach with ctrl-a ctrl-d)
 runscreenfg: stop $(OUTPUT_FILE)
-	@echo "Running $(RUN_COMMAND) in a screen"
-	@cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -m $(RUN_COMMAND)
+	$(AT) echo "Running $(RUN_COMMAND) in a screen"
+	$(AT) cd $(RUN_FROM) && screen -S $(SCREEN_NAME) -m $(RUN_COMMAND)
 
 STARTUP_COMMAND=printf "\#!/bin/sh\n\#\n\# This file is autogenerated by Bela. Do not edit!\n\necho Running Bela...\nscreen -S $(SCREEN_NAME) -d -m %s $(RUN_COMMAND) %s\n"
 nostartup: ## No Bela project runs at startup 
 nostartup:
-	@echo "Disabling Bela at startup..."
-	@printf "#!/bin/sh\n#\n\n# This file is autogenerated by Bela. Do not edit!\n\n# Run on startup disabled -- nothing to do here\n" > $(BELA_STARTUP_SCRIPT)
+	$(AT) echo "Disabling Bela at startup..."
+	$(AT) printf "#!/bin/sh\n#\n\n# This file is autogenerated by Bela. Do not edit!\n\n# Run on startup disabled -- nothing to do here\n" > $(BELA_STARTUP_SCRIPT)
 
 startuploop: ## Makes PROJECT run at startup and restarts it if it crashes
 startuploop: Bela
-	@echo "Enabling Bela at startup in a loop..."
-	@$(STARTUP_COMMAND) 'bash -c "while sleep 0.5 ; do echo Running Bela...;' '; done"' > $(BELA_STARTUP_SCRIPT)
+	$(AT) echo "Enabling Bela at startup in a loop..."
+	$(AT) $(STARTUP_COMMAND) 'bash -c "while sleep 0.5 ; do echo Running Bela...;' '; done"' > $(BELA_STARTUP_SCRIPT)
 
 startup: ## Makes PROJECT run at startup
 startup: Bela
-	@echo "Enabling Bela at startup..."
-	@$(STARTUP_COMMAND) > $(BELA_STARTUP_SCRIPT)
-	@chmod +x $(BELA_STARTUP_SCRIPT)
+	$(AT) echo "Enabling Bela at startup..."
+	$(AT) $(STARTUP_COMMAND) > $(BELA_STARTUP_SCRIPT)
+	$(AT) chmod +x $(BELA_STARTUP_SCRIPT)
 stop: ## Stops any Bela program that is currently running
 stop:
-	@PID=`grep $(BELA_AUDIO_THREAD_NAME) /proc/xenomai/stat | cut -d " " -f 5 | sed s/\s//g`; if [ -z $$PID ]; then [ $(QUIET) = true ] || echo "No process to kill"; else [  $(QUIET) = true  ] || echo "Killing old Bela process $$PID"; kill -2 $$PID; fi; screen -X -S $(SCREEN_NAME) quit > /dev/null; exit 0;
+	$(AT) PID=`grep $(BELA_AUDIO_THREAD_NAME) /proc/xenomai/stat | cut -d " " -f 5 | sed s/\s//g`; if [ -z $$PID ]; then [ $(QUIET) = true ] || echo "No process to kill"; else [  $(QUIET) = true  ] || echo "Killing old Bela process $$PID"; kill -2 $$PID; fi; screen -X -S $(SCREEN_NAME) quit > /dev/null; exit 0;
 
 connect: ## Connects to the running Bela program (if any), can detach with ctrl-a ctrl-d.
-	@screen -r -S $(SCREEN_NAME)
+	$(AT) screen -r -S $(SCREEN_NAME)
 	
 idestart: ## Starts the on-board IDE
 idestart: idestop
-	@printf "Starting IDE..."
-	@$(BELA_IDE_RUN_COMMAND)
-	@printf "done\n"
+	$(AT) printf "Starting IDE..."
+	$(AT) $(BELA_IDE_RUN_COMMAND)
+	$(AT) printf "done\n"
 
 idestop: ## Stops the on-board IDE
-	@printf "Stopping currently running IDE..."
-	@screen -X -S $(BELA_IDE_SCREEN_NAME) quit > /dev/null; exit 0;
-	@printf "done\n"
+	$(AT) printf "Stopping currently running IDE..."
+	$(AT) screen -X -S $(BELA_IDE_SCREEN_NAME) quit > /dev/null; exit 0;
+	$(AT) printf "done\n"
 
 BELA_IDE_STARTUP_COMMAND=printf '\#!/bin/sh\n\#\n\# This file is autogenerated by Bela. Do not edit!\n\necho Running the Bela IDE...\n$(BELA_IDE_RUN_COMMAND)\n' > $(BELA_IDE_STARTUP_SCRIPT)
 
 idestartup: ## Enables the IDE at startup
-	@echo "Enabling the IDE at startup"
-	@$(BELA_IDE_STARTUP_COMMAND)
-	@chmod +x $(BELA_IDE_STARTUP_SCRIPT)
+	$(AT) echo "Enabling the IDE at startup"
+	$(AT) $(BELA_IDE_STARTUP_COMMAND)
+	$(AT) chmod +x $(BELA_IDE_STARTUP_SCRIPT)
 
 idenostartup: ## Disables the IDE at startup
-	@echo "Disabling the IDE at startup"
-	@printf "#!/bin/sh\n#\n\n# This file is autogenerated by Bela. Do not edit!\n\n# The Bela IDE is disabled on startup.\n" > $(BELA_IDE_STARTUP_SCRIPT)
+	$(AT) echo "Disabling the IDE at startup"
+	$(AT) printf "#!/bin/sh\n#\n\n# This file is autogenerated by Bela. Do not edit!\n\n# The Bela IDE is disabled on startup.\n" > $(BELA_IDE_STARTUP_SCRIPT)
 
 ideconnect: ## Brings in the foreground the IDE that currently is running in a screen (if any), can detach with ctrl-a ctrl-d.
-	@screen -r -S $(BELA_IDE_SCREEN_NAME)
+	$(AT) screen -r -S $(BELA_IDE_SCREEN_NAME)
 
 BELA_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 UPDATES_DIR?=/root/Bela/updates
 UPDATE_SOURCE_DIR_BASE?=/tmp/belaUpdate
 UPDATE_SOURCE_DIR=$(UPDATE_SOURCE_DIR_BASE)/Bela

 UPDATE_BELA_PATCH?=/tmp/belaPatch
 UPDATE_BELA_BACKUP?=/tmp/belaBak
 UPDATE_BELA_MV_BACKUP?=/tmp/belaMvBak
 
 updateclean: ## Cleans the $(UPDATES_DIR) folder
-	@[ -n $(UPDATE_DIR) ] && rm -rf $(UPDATE_DIR) && mkdir -p $(UPDATE_DIR)
+	$(AT) [ -n $(UPDATE_DIR) ] && rm -rf $(UPDATE_DIR) && mkdir -p $(UPDATE_DIR)
 
 checkupdate: ## Unzips the zip file in $(UPDATES_DIR) and checks that it contains a valid
-	@echo Validating archive...
-	@cd $(UPDATES_DIR) && COUNT=`ls -l *.zip | wc -l` && [ $$COUNT -eq 1 ] && rm -rf `ls | grep -v "\.zip$$"`
-	@#TODO: heuristics on available space. Use unzip -l and df
-	@echo uncompressed size: `unzip -l \`ls $(UPDATES_DIR)/*.zip\` | tail -n1 | awk '{print $$1}'`
-	@# Delete and re-create the temp directory (first, make sure it is not an empty string!)
-	@[ -n $(UPDATE_SOURCE_DIR_BASE) ] && rm -rf $(UPDATE_SOURCE_DIR_BASE) && mkdir -p $(UPDATE_SOURCE_DIR_BASE)
-	@echo Unzipping archive...
-	@cd $(UPDATE_SOURCE_DIR_BASE) && unzip -qq $(UPDATES_DIR)/*zip
+	$(AT) echo Validating archive...
+	$(AT) cd $(UPDATES_DIR) && COUNT=`ls -l *.zip | wc -l` && [ $$COUNT -eq 1 ] && rm -rf `ls | grep -v "\.zip$$"`
+	$(AT) #TODO: heuristics on available space. Use unzip -l and df
+	$(AT) echo uncompressed size: `unzip -l \`ls $(UPDATES_DIR)/*.zip\` | tail -n1 | awk '{print $$1}'`
+	$(AT) # Delete and re-create the temp directory (first, make sure it is not an empty string!)
+	$(AT) [ -n $(UPDATE_SOURCE_DIR_BASE) ] && rm -rf $(UPDATE_SOURCE_DIR_BASE) && mkdir -p $(UPDATE_SOURCE_DIR_BASE)
+	$(AT) echo Unzipping archive...
+	$(AT) cd $(UPDATE_SOURCE_DIR_BASE) && unzip -qq $(UPDATES_DIR)/*zip
 #TODO: this should not be needed. Remove comments.  Strip the top-level folder ( if there is only one )
 #@DIR=`ls -d $(UPDATE_SOURCE_DIR)` && COUNT=`echo $$DIR | wc -l` &&\
 	  [ $$COUNT -eq 1 ] && mv $(UPDATE_SOURCE_DIR)/* /tmp/supertemp && rm -rf $(UPDATE_SOURCE_DIR) && mv /tmp/supertemp $(UPDATE_SOURCE_DIR)
 	
-	@echo Validating unzipped archive...
-	@cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
+	$(AT) echo Validating unzipped archive...
+	$(AT) cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
 	  [ $$FAIL -eq 0 ] || { echo "$$path was not found in the zip archive. Maybe it is corrupted?"; exit 1; }
-	@echo 	...done
+	$(AT) echo 	...done
 UPDATE_LOG?=~/update.log
 LOG=>> $(UPDATE_LOG) 2>&1
 updateunsafe: ## Installs the update from $(UPDATES_DIR) in a more brick-friendly way
-	@echo > $(UPDATE_LOG)
+	$(AT) echo > $(UPDATE_LOG)
 	# Re-perform the check, just in case ...	
-	@cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
+	$(AT) cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
 	  [ $$FAIL -eq 0 ] || { echo "$$path was not found in the zip archive. Maybe it is corrupted?"; exit 1; }
-	@cd $(UPDATE_SOURCE_DIR)/scripts && BBB_ADDRESS=root@127.0.0.1 BBB_BELA_HOME=$(BELA_DIR) ./update_board -y --no-frills
-	@screen -S update-Bela -d -m bash -c "echo Restart the IDE $(LOG) &&\
+	$(AT) cd $(UPDATE_SOURCE_DIR)/scripts && BBB_ADDRESS=root@127.0.0.1 BBB_BELA_HOME=$(BELA_DIR) ./update_board -y --no-frills
+	$(AT) screen -S update-Bela -d -m bash -c "echo Restart the IDE $(LOG) &&\
 	  $(MAKE) --no-print-directory idestart $(LOG) && echo Update succesful $(LOG);" $(LOG)
 update: ## Installs the update from $(UPDATES_DIR)
 update: stop
-	@# Truncate the log file
-	@echo > $(UPDATE_LOG)
-	@echo Re-perform the check, just in case ... >> $(UPDATE_LOG)
-	@cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
+	$(AT) # Truncate the log file
+	$(AT) echo > $(UPDATE_LOG)
+	$(AT) echo Re-perform the check, just in case ... >> $(UPDATE_LOG)
+	$(AT) cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
 	  [ $$FAIL -eq 0 ] || { echo "$$path was not found in the zip archive. Maybe it is corrupted?"; exit 1; }
-	@[ -n $(UPDATE_BELA_PATCH) ] && mkdir -p $(UPDATE_BELA_PATCH)
-	@#TODO: this would allow to trim trailing slashes in case we want to be safer: a="`pwd`/" ; target=${a%/} ; echo $target
-	@$(MAKE) --no-print-directory coreclean
-	@echo Backing up $(BELA_DIR) to $(UPDATE_BELA_PATCH) ... | tee -a $(UPDATE_LOG)
-	@rsync -a --delete-during --exclude Documentation $(BELA_DIR)/ $(UPDATE_BELA_PATCH)
-	@echo Backing up $(BELA_DIR) to $(UPDATE_BELA_BACKUP) ... | tee -a $(UPDATE_LOG)
-	@[ -n $(UPDATE_BELA_BACKUP) ] && mkdir -p $(UPDATE_BELA_BACKUP)
-	@rsync -a --delete-during $(BELA_DIR)/ $(UPDATE_BELA_BACKUP)
-	@echo Running update script... | tee -a $(UPDATE_LOG)
-	@cd $(UPDATE_SOURCE_DIR)/scripts && BBB_ADDRESS=root@127.0.0.1 BBB_BELA_HOME=$(UPDATE_BELA_PATCH) ./update_board -y --no-frills
-	@echo Restoring directory structure... | tee -a $(UPDATE_LOG)
-	@screen -S update-Bela -d -m bash -c '\
+	$(AT) [ -n $(UPDATE_BELA_PATCH) ] && mkdir -p $(UPDATE_BELA_PATCH)
+	$(AT) #TODO: this would allow to trim trailing slashes in case we want to be safer: a="`pwd`/" ; target=${a%/} ; echo $target
+	$(AT) $(MAKE) --no-print-directory coreclean
+	$(AT) echo Backing up $(BELA_DIR) to $(UPDATE_BELA_PATCH) ... | tee -a $(UPDATE_LOG)
+	$(AT) rsync -a --delete-during --exclude Documentation $(BELA_DIR)/ $(UPDATE_BELA_PATCH)
+	$(AT) echo Backing up $(BELA_DIR) to $(UPDATE_BELA_BACKUP) ... | tee -a $(UPDATE_LOG)
+	$(AT) [ -n $(UPDATE_BELA_BACKUP) ] && mkdir -p $(UPDATE_BELA_BACKUP)
+	$(AT) rsync -a --delete-during $(BELA_DIR)/ $(UPDATE_BELA_BACKUP)
+	$(AT) echo Running update script... | tee -a $(UPDATE_LOG)
+	$(AT) cd $(UPDATE_SOURCE_DIR)/scripts && BBB_ADDRESS=root@127.0.0.1 BBB_BELA_HOME=$(UPDATE_BELA_PATCH) ./update_board -y --no-frills
+	$(AT) # If everything went ok, we now have the updated version of $(BELA_DIR) in $(UPDATE_BELA_PATCH) and a backup of $(BELA_DIR) in $(UPDATE_BELA_BACKUP)
+	$(AT) # So let's operate the magic swap. $(BELA_DIR) is moved to $(UPDATE_BELA_MV_BACKUP) and $(UPDATE_BELA_PATCH) is moved to $(BELA_DIR).
+	$(AT) # If something goes wrong at thie stage, you can always find your old $(BELA_DIR) folder at $(UPDATE_BELA_BACKUP)
+	$(AT) # The fun part is that this Makefile is moved as well...
+	$(AT) # We are about to kill the IDE, so just in case you are running this from within the IDE, we run the remainder of this update in a screen.
+	$(AT) # Output will be logged to $(UPDATE_LOG)
+	$(AT) echo Restoring directory structure... | tee -a $(UPDATE_LOG)
+	$(AT) screen -S update-Bela -d -m bash -c '\
 	  [ -n $(UPDATE_BELA_MV_BACKUP) ] $(LOG) && rm -rf $(UPDATE_BELA_MV_BACKUP) $(LOG) &&\
 	  echo Kill the IDE $(LOG) && \
 	  $(MAKE) --no-print-directory idestop $(LOG) &&\
 	  mv $(BELA_DIR) $(UPDATE_BELA_MV_BACKUP) $(LOG) && mv $(UPDATE_BELA_PATCH) $(BELA_DIR) $(LOG) &&\
 	  echo Hope we are still alive here $(LOG) &&\