Description: be verbose in the build
 Remove all @ signs from the makefile, except the ones for echo statements, to
 make the build log show what is happening.
Author: Bas Wijnen <wijnen@debian.org>
Origin: debian
Forwarded: not-needed
Last-Update: 2015-06-20

--- openmsx-catapult-0.11.0.orig/build/main.mk
+++ openmsx-catapult-0.11.0/build/main.mk
@@ -107,8 +107,8 @@ DETECTSYS_SCRIPT:=$(MAKE_PATH)/detectsys
 
 $(DETECTSYS_MAKE): $(DETECTSYS_SCRIPT)
 	@echo "Autodetecting native system:"
-	@mkdir -p $(@D)
-	@$(PYTHON) $< > $@
+	mkdir -p $(@D)
+	$(PYTHON) $< > $@
 
 endif # CATAPULT_TARGET_OS
 endif # CATAPULT_TARGET_CPU
@@ -289,9 +289,9 @@ endif
 # TODO: It would be cleaner to include probe.mk and probe-results.mk,
 #       instead of executing them in a sub-make.
 $(PROBE_MAKE): $(PROBE_SCRIPT)
-	@OUTDIR=$(@D) COMPILE=g++ MAKE_LOCATION=$(MAKE_PATH) CURRENT_OS=$(CATAPULT_TARGET_OS)\
+	OUTDIR=$(@D) COMPILE=g++ MAKE_LOCATION=$(MAKE_PATH) CURRENT_OS=$(CATAPULT_TARGET_OS)\
 		$(MAKE) --no-print-directory -f $<
-	@PROBE_MAKE=$(PROBE_MAKE) MAKE_PATH=$(MAKE_PATH) \
+	PROBE_MAKE=$(PROBE_MAKE) MAKE_PATH=$(MAKE_PATH) \
 		$(MAKE) --no-print-directory -f $(MAKE_PATH)/probe-results.mk
 
 # TODO: Relying on CONFIG_HEADER being built before BINARY_FULL,
@@ -305,40 +305,40 @@ config:
 
 $(BINARY_FULL): $(OBJECTS_FULL) $(RESOURCE_OBJ)
 	@echo "Linking $(BINARY_FILE)..."
-	@mkdir -p $(@D)
-	@$(CXX) -o $@ $^ $(LINK_FLAGS)
+	mkdir -p $(@D)
+	$(CXX) -o $@ $^ $(LINK_FLAGS)
 
 # Compile and generate dependency files in one go.
 DEPEND_SUBST=$(patsubst $(SOURCES_PATH)/%.cpp,$(DEPEND_PATH)/%.d,$<)
 $(OBJECTS_FULL): $(OBJECTS_PATH)/%.o: $(SOURCES_PATH)/%.cpp $(DEPEND_PATH)/%.d
 	@echo "Compiling $(<:$(SOURCES_PATH)/%.cpp=%)..."
-	@mkdir -p $(@D)
-	@mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
-	@$(CXX) $(DEPEND_FLAGS) -MMD -MF $(DEPEND_SUBST) \
+	mkdir -p $(@D)
+	mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
+	$(CXX) $(DEPEND_FLAGS) -MMD -MF $(DEPEND_SUBST) \
 		-o $@ $(CXXFLAGS) -c $<
-	@touch $@ # Force .o file to be newer than .d file.
+	touch $@ # Force .o file to be newer than .d file.
 
 ifeq ($(CATAPULT_TARGET_OS),mingw32)
 $(RESOURCE_HEADER): $(VERSION_MAKE) forceversionextraction
 	$(PYTHON) $(BUILD_PATH)/win_resource.py $@
 $(RESOURCE_OBJ): $(RESOURCE_SRC) $(RESOURCE_HEADER)
 	@echo "Compiling resources..."
-	@windres $(addprefix --include-dir=,$(^D)) -o $@ -i $<
+	windres $(addprefix --include-dir=,$(^D)) -o $@ -i $<
 endif
 
 $(XRC_FULL): $(XRC_PATH)/%.xrc: $(DIALOGS_PATH)/%.wxg $(SEDSCRIPT)
 	@echo "Converting $(@:$(XRC_PATH)/%=%)..."
-	@mkdir -p $(@D)
-	@sed -f $(SEDSCRIPT) $< > $@
+	mkdir -p $(@D)
+	sed -f $(SEDSCRIPT) $< > $@
 
 $(BITMAPS): $(BUILD_PATH)/%: %
 	@echo "Copying $(<:$(BITMAPS_PATH)/%=%)..."
-	@mkdir -p $(@D)
-	@cp $< $@
+	mkdir -p $(@D)
+	cp $< $@
 
 clean:
 	@echo "Cleaning up..."
-	@rm -rf $(BUILD_PATH)
+	rm -rf $(BUILD_PATH)
 
 
 # Installation and Binary Packaging
@@ -371,28 +371,28 @@ install: all
 endif
 	@echo "Installing to $(INSTALL_PREFIX)$(CATAPULT_INSTALL):"
 	@echo "  Executable..."
-	@mkdir -p $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)
 ifeq ($(CATAPULT_PREBUILT),true)
-	@cp -f $(BINARY_FULL) $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE)
+	cp -f $(BINARY_FULL) $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE)
 else
-	@strip -o $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE) $(BINARY_FULL)
+	strip -o $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE) $(BINARY_FULL)
 endif
 	@echo "  Data files..."
-	@mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
-	@cp -rf $(RESOURCES_PATH) $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
+	cp -rf $(RESOURCES_PATH) $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/
 	@echo "  Documentation..."
-	@mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
-	@cp -f README $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
-	@cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
-	@mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)/manual
-	@cp -f $(addprefix doc/manual/,*.html *.css *.png) \
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
+	cp -f README $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
+	cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)/manual
+	cp -f $(addprefix doc/manual/,*.html *.css *.png) \
 		$(INSTALL_PREFIX)$(INSTALL_DOC_DIR)/manual
 ifeq ($(CATAPULT_PREBUILT),false)
 ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
 	@echo "  Desktop hooks..."
-	@mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
-	@cp -rf src/catapult.xpm $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
-	@if [ -d $(INSTALL_PREFIX)/usr/share/applications -a -w $(INSTALL_PREFIX)/usr/share/applications ]; \
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
+	cp -rf src/catapult.xpm $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
+	if [ -d $(INSTALL_PREFIX)/usr/share/applications -a -w $(INSTALL_PREFIX)/usr/share/applications ]; \
 		then sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
 			desktop/openMSX-Catapult.desktop \
 			> $(INSTALL_PREFIX)/usr/share/applications/openMSX-Catapult.desktop; \
@@ -404,7 +404,7 @@ ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true
 endif
 ifeq ($(SYMLINK_FOR_BINARY),true)
 	@echo "  Creating symlink..."
-	@if [ -d /usr/local/bin -a -w /usr/local/bin ]; \
+	if [ -d /usr/local/bin -a -w /usr/local/bin ]; \
 		then ln -sf $(INSTALL_BINARY_DIR)/$(BINARY_FILE) \
 			/usr/local/bin/$(BINARY_FILE); \
 		else if [ -d ~/bin ]; \
@@ -414,7 +414,7 @@ ifeq ($(SYMLINK_FOR_BINARY),true)
 		fi
 endif
 	@echo "  Setting permissions..."
-	@chmod -R a+rX $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
+	chmod -R a+rX $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
 endif # CATAPULT_PREBUILT
 	@echo "Installation complete... have fun!"
 
@@ -456,12 +456,12 @@ DIST_FULL+=$(addprefix desktop/, \
 
 dist:
 	@echo "Removing any old distribution files..."
-	@rm -rf $(DIST_PATH)
+	rm -rf $(DIST_PATH)
 	@echo "Gathering files for distribution..."
-	@mkdir -p $(DIST_PATH)
-	@cp -p --parents $(DIST_FULL) $(DIST_PATH)
+	mkdir -p $(DIST_PATH)
+	cp -p --parents $(DIST_FULL) $(DIST_PATH)
 	@echo "Creating tarball..."
-	@cd $(DIST_BASE) ; GZIP=--best tar zcf $(PACKAGE_FULL).tar.gz $(PACKAGE_FULL)
+	cd $(DIST_BASE) ; GZIP=--best tar zcf $(PACKAGE_FULL).tar.gz $(PACKAGE_FULL)
 
 
 # Dependencies
