# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1578970470 -7200
# Node ID 621d071530cebaf620521228a50260ee96a0ad2a
# Parent  510837da62aa7eca37e9da4ca27f3236e346f763
Convert more instances of direct commands in rules to DO_CMD macro calls.

diff -r 510837da62aa -r 621d071530ce Makefile.gen
--- a/Makefile.gen	Tue Jan 14 03:28:48 2020 +0200
+++ b/Makefile.gen	Tue Jan 14 04:54:30 2020 +0200
@@ -438,20 +438,16 @@
 
 
 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
-	@echo " FONT $@ $<"
-	@$(FONTCONV_BIN) $< $@
+	@$(call DO_CMD,FONT,$@ $<,$(FONTCONV_BIN) $< $@)
 
 $(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_DEP)
-	@echo " DATA $@ $<"
-	@$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null
+	@$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null)
 
 $(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_DEP)
-	@echo " DATA $@ $<"
-	@$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null
+	@$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null)
 
 $(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png  $(DATA2INC_DEP)
-	@echo " DATA $@ $<"
-	@$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null
+	@$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null)
 
 
 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
@@ -548,8 +544,7 @@
 	
 
 $(EDITOR_MAKEFILE): $(EDITOR_PRO)
-	@echo " QMAKE $+"
-	@qmake -Wall $<
+	@$(call DO_CMD,QMAKE,$+,qmake -Wall $<)
 
 $(BINPATH)ed_$(DEMO_BIN)$(BINEXT): $(EDITOR_MAKEFILE)
 	@$(MAKE) -f $<