Index: openmsx-debugger-0.0.0.svn20130623/build/main.mk
===================================================================
--- openmsx-debugger-0.0.0.svn20130623.orig/build/main.mk	2013-06-23 11:40:34.350081551 -0400
+++ openmsx-debugger-0.0.0.svn20130623/build/main.mk	2013-06-23 12:02:03.926901831 -0400
@@ -79,9 +79,9 @@
 -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
 
@@ -219,14 +219,14 @@
 # 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
 
 # Default target.
@@ -289,31 +289,31 @@
 
 # Generate version header.
 $(VERSION_HEADER): ChangeLog $(MAKE_PATH)/version.mk
-	@echo "Creating $@..."
-	@mkdir -p $(@D)
-	@echo "// Automatically generated by build process." > $@
-	@echo "" >> $@
-	@echo "const bool Version::RELEASE = $(RELEASE_FLAG);" >> $@
-	@echo "const std::string Version::VERSION = \"$(PACKAGE_VERSION)\";" >> $@
-	@echo "const std::string Version::CHANGELOG_REVISION = \"$(CHANGELOG_REVISION)\";" >> $@
+	echo "Creating $@..."
+	mkdir -p $(@D)
+	echo "// Automatically generated by build process." > $@
+	echo "" >> $@
+	echo "const bool Version::RELEASE = $(RELEASE_FLAG);" >> $@
+	echo "const std::string Version::VERSION = \"$(PACKAGE_VERSION)\";" >> $@
+	echo "const std::string Version::CHANGELOG_REVISION = \"$(CHANGELOG_REVISION)\";" >> $@
 
 # 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.
@@ -323,28 +323,28 @@
 # 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.
@@ -354,24 +354,24 @@
 ifeq ($(OPENMSX_TARGET_OS),mingw32)
 WIN32_FILEVERSION:=$(shell echo $(PACKAGE_VERSION) $(CHANGELOG_REVISION) | sed -ne 's/\([0-9]\)*\.\([0-9]\)*\.\([0-9]\)*[^ ]* \([0-9]*\)/\1, \2, \3, \4/p' -)
 $(RESOURCE_HEADER): $(INIT_DUMMY_FILE) ChangeLog $(MAKE_PATH)/version.mk
-	@echo "Writing resource header..."
-	@mkdir -p $(@D)
-	@echo "#define OPENMSXDEBUGGER_VERSION_INT $(WIN32_FILEVERSION)" > $@
-	@echo "#define OPENMSXDEBUGGER_VERSION_STR \"$(PACKAGE_VERSION)\0\"" >> $@
+	echo "Writing resource header..."
+	mkdir -p $(@D)
+	echo "#define OPENMSXDEBUGGER_VERSION_INT $(WIN32_FILEVERSION)" > $@
+	echo "#define OPENMSXDEBUGGER_VERSION_STR \"$(PACKAGE_VERSION)\0\"" >> $@
 $(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.
@@ -379,20 +379,20 @@
 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
 
 
@@ -403,16 +403,16 @@
 DIST_PATH:=$(DIST_BASE)/$(PACKAGE_FULL)
 
 dist: $(DETECTSYS_SCRIPT)
-	@echo "Removing any old distribution files..."
-	@rm -rf $(DIST_PATH)
-	@echo "Gathering files for distribution..."
-	@mkdir -p $(DIST_PATH)
-	@build/install-recursive.sh $(DIST_FULL) $(DIST_PATH)
-	@build/install-recursive.sh $(HEADERS_FULL) $(DIST_PATH)
-	@build/install-recursive.sh $(SOURCES_FULL) $(DIST_PATH)
-	@build/install-recursive.sh $(UI_FULL) $(DIST_PATH)
-	@echo "Creating tarball..."
-	@cd $(DIST_BASE) && \
+	echo "Removing any old distribution files..."
+	rm -rf $(DIST_PATH)
+	echo "Gathering files for distribution..."
+	mkdir -p $(DIST_PATH)
+	build/install-recursive.sh $(DIST_FULL) $(DIST_PATH)
+	build/install-recursive.sh $(HEADERS_FULL) $(DIST_PATH)
+	build/install-recursive.sh $(SOURCES_FULL) $(DIST_PATH)
+	build/install-recursive.sh $(UI_FULL) $(DIST_PATH)
+	echo "Creating tarball..."
+	cd $(DIST_BASE) && \
 		GZIP=--best tar zcf $(PACKAGE_FULL).tar.gz $(PACKAGE_FULL)
 
 endif # PLATFORM
