Index: openmsx-debugger-0.1~git20170806/build/main.mk
===================================================================
--- openmsx-debugger-0.1~git20170806.orig/build/main.mk
+++ openmsx-debugger-0.1~git20170806/build/main.mk
@@ -62,9 +62,9 @@ DETECTSYS_SCRIPT:=$(MAKE_PATH)/detectsys
 -include $(DETECTSYS_MAKE)
 
 $(DETECTSYS_MAKE): $(DETECTSYS_SCRIPT)
-	@echo "Autodetecting native system:"
-	@mkdir -p $(@D)
-	@$(PYTHON) $< > $@
+	echo "Autodetecting native system:"
+	mkdir -p $(@D)
+	$(PYTHON) $< > $@
 
 endif # OPENMSX_TARGET_OS
 
@@ -198,14 +198,14 @@ endif
 # Clean up build tree of current flavour.
 # We don't have flavours (yet?), so clean up everything except "detectsys".
 clean:
-	@echo "Cleaning up..."
-	@rm -rf $(OBJECTS_PATH)
-	@rm -rf $(DEPEND_PATH)
-	@rm -rf $(GEN_SRC_PATH)
+	echo "Cleaning up..."
+	rm -rf $(OBJECTS_PATH)
+	rm -rf $(DEPEND_PATH)
+	rm -rf $(GEN_SRC_PATH)
 ifeq ($(OPENMSX_TARGET_OS),darwin)
-	@rm -rf $(APP_PATH)
+	rm -rf $(APP_PATH)
 else
-	@rm -rf $(BINARY_PATH)
+	rm -rf $(BINARY_PATH)
 endif
 
 # Generate version header.
@@ -290,21 +290,21 @@ DEPEND_FLAGS+=-MP
 
 # Generate Meta Object Compiler sources.
 $(MOC_SRC_FULL): $(GEN_SRC_PATH)/moc_%.cpp: $(SOURCES_PATH)/%.h
-	@echo "Generating $(@F)..."
-	@mkdir -p $(@D)
-	@$(QT_INSTALL_BINS)/moc -o $@ $<
+	echo "Generating $(@F)..."
+	mkdir -p $(@D)
+	$(QT_INSTALL_BINS)/moc -o $@ $<
 
 # Generate resource source.
 $(RES_SRC_FULL): $(GEN_SRC_PATH)/qrc_%.cpp: $(RESOURCES_PATH)/%.qrc
-	@echo "Generating $(@F)..."
-	@mkdir -p $(@D)
-	@$(QT_INSTALL_BINS)/rcc -name $(<:$(RESOURCES_PATH)/%.qrc=%) $< -o $@
+	echo "Generating $(@F)..."
+	mkdir -p $(@D)
+	$(QT_INSTALL_BINS)/rcc -name $(<:$(RESOURCES_PATH)/%.qrc=%) $< -o $@
 
 # Generate ui files.
 $(UI_HDR_FULL): $(GEN_SRC_PATH)/ui_%.h: $(SOURCES_PATH)/%.ui
-	@echo "Generating $(@F)..."
-	@mkdir -p $(@D)
-	@$(QT_INSTALL_BINS)/uic -o $@ $<
+	echo "Generating $(@F)..."
+	mkdir -p $(@D)
+	$(QT_INSTALL_BINS)/uic -o $@ $<
 # This is a workaround for the lack of order-only dependencies in GNU Make
 # versions before than 3.80 (for example Mac OS X 10.3 still ships with 3.79).
 # It creates a dummy file, which is never modified after its initial creation.
@@ -314,28 +314,28 @@ $(UI_HDR_FULL): $(GEN_SRC_PATH)/ui_%.h:
 # files to be considered outdated.
 GEN_DUMMY_FILE:=$(GEN_SRC_PATH)/dummy-file
 $(GEN_DUMMY_FILE): $(UI_HDR_FULL) $(GENERATED_HEADERS)
-	@test -e $@ || touch $@
+	test -e $@ || touch $@
 
 # Compile and generate dependency files in one go.
 SRC_DEPEND_SUBST=$(patsubst $(SOURCES_PATH)/%.cpp,$(DEPEND_PATH)/%.d,$<)
 GEN_DEPEND_SUBST=$(patsubst $(GEN_SRC_PATH)/%.cpp,$(DEPEND_PATH)/%.d,$<)
 $(OBJECTS_FULL): $(GEN_DUMMY_FILE)
 $(OBJECTS_FULL): $(OBJECTS_PATH)/%.o: $(SOURCES_PATH)/%.cpp $(DEPEND_PATH)/%.d
-	@echo "Compiling $(patsubst $(SOURCES_PATH)/%,%,$<)..."
-	@mkdir -p $(@D)
-	@mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
-	@$(COMPILE_ENV) $(CXX) \
+	echo "Compiling $(patsubst $(SOURCES_PATH)/%,%,$<)..."
+	mkdir -p $(@D)
+	mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
+	$(COMPILE_ENV) $(CXX) \
 		$(DEPEND_FLAGS) -MMD -MF $(SRC_DEPEND_SUBST) \
 		-o $@ $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
-	@touch $@ # Force .o file to be newer than .d file.
+	touch $@ # Force .o file to be newer than .d file.
 $(GEN_OBJ_FULL): $(OBJECTS_PATH)/%.o: $(GEN_SRC_PATH)/%.cpp $(DEPEND_PATH)/%.d
-	@echo "Compiling $(patsubst $(GEN_SRC_PATH)/%,%,$<)..."
-	@mkdir -p $(@D)
-	@mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
-	@$(COMPILE_ENV) $(CXX) \
+	echo "Compiling $(patsubst $(GEN_SRC_PATH)/%,%,$<)..."
+	mkdir -p $(@D)
+	mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
+	$(COMPILE_ENV) $(CXX) \
 		$(DEPEND_FLAGS) -MMD -MF $(GEN_DEPEND_SUBST) \
 		-o $@ $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
-	@touch $@ # Force .o file to be newer than .d file.
+	touch $@ # Force .o file to be newer than .d file.
 # Generate dependencies that do not exist yet.
 # This is only in case some .d files have been deleted;
 # in normal operation this rule is never triggered.
@@ -344,21 +344,21 @@ $(DEPEND_FULL):
 # Windows resources that are added to the executable.
 ifeq ($(OPENMSX_TARGET_OS),mingw32)
 $(RESOURCE_HEADER): forceversionextraction
-	@$(PYTHON) $(RESOURCE_SCRIPT) $@
+	$(PYTHON) $(RESOURCE_SCRIPT) $@
 $(RESOURCE_OBJ): $(RESOURCE_SRC) $(RESOURCE_HEADER)
-	@echo "Compiling resources..."
-	@mkdir -p $(@D)
-	@$(WINDRES) $(addprefix --include-dir=,$(^D)) -o $@ -i $<
+	echo "Compiling resources..."
+	mkdir -p $(@D)
+	$(WINDRES) $(addprefix --include-dir=,$(^D)) -o $@ -i $<
 endif
 
 # Link executable.
 $(BINARY_FULL): $(OBJECTS_FULL) $(GEN_OBJ_FULL) $(RESOURCE_OBJ)
 ifeq ($(OPENMSX_SUBSET),)
-	@echo "Linking $(@F)..."
-	@mkdir -p $(@D)
-	@$(LINK_ENV) $(CXX) -o $@ $(CXXFLAGS) $^ $(LINK_FLAGS)
+	echo "Linking $(@F)..."
+	mkdir -p $(@D)
+	$(LINK_ENV) $(CXX) -o $@ $(CXXFLAGS) $^ $(LINK_FLAGS)
 else
-	@echo "Not linking $(notdir $@) because only a subset was built."
+	echo "Not linking $(notdir $@) because only a subset was built."
 endif
 
 # Application folder.
@@ -366,20 +366,20 @@ ifeq ($(OPENMSX_TARGET_OS),darwin)
 app: $(BINARY_FULL) $(PKGINFO_FULL) $(APP_PLIST) $(APP_RESOURCES)
 
 $(PKGINFO_FULL):
-	@echo "Generating $(@F)..."
-	@mkdir -p $(@D)
-	@echo "APPLoMXD" > $@
+	echo "Generating $(@F)..."
+	mkdir -p $(@D)
+	echo "APPLoMXD" > $@
 
 $(APP_PLIST): $(APP_PATH)/Contents/%: $(APP_SUPPORT_PATH)/%
-	@echo "Generating $(@F)..."
-	@mkdir -p $(@D)
-	@sed -e 's/%ICON%/$(notdir $(APP_ICON))/' \
+	echo "Generating $(@F)..."
+	mkdir -p $(@D)
+	sed -e 's/%ICON%/$(notdir $(APP_ICON))/' \
 		-e 's/%VERSION%/$(PACKAGE_DETAILED_VERSION)/' < $< > $@
 
 $(APP_RESOURCES): $(APP_PATH)/Contents/Resources/%: $(APP_SUPPORT_PATH)/%
-	@echo "Copying $(@F)..."
-	@mkdir -p $(@D)
-	@cp $< $@
+	echo "Copying $(@F)..."
+	mkdir -p $(@D)
+	cp $< $@
 endif
 
 
@@ -387,6 +387,6 @@ endif
 # ================
 
 dist:
-	@$(PYTHON) build/gitdist.py
+	$(PYTHON) build/gitdist.py
 
 endif # PLATFORM