From 9ad8f01ce826ddce03f307023dc14dfe9d6d9d5a Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Sat, 5 Jan 2013 17:56:22 +0200
Subject: [PATCH] antimake: convert mkdir and printf to functions.

Then it's possible to examine and change arguments.
---
 mk/antimake.mk | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/mk/antimake.mk b/mk/antimake.mk
index 8c7566d..9d690c4 100755
--- a/mk/antimake.mk
+++ b/mk/antimake.mk
@@ -390,9 +390,15 @@ endif
 ## Quiet by default, 'make V=1' shows commands
 ##
 
+# 1-dir
+MkDir = $(MKDIR_P) $(1)
+
+# 1-fmt, 2-args
+Printf = printf $(1) $(2)
+
 CTX ?=
 ifeq ($(V), 0)
-E = @printf "%-4s %-8s %s\n" "$(CTX)"
+E = @$(call Printf,"%-4s %-8s %s\n","$(CTX)")
 Q = @
 LIBTOOLQ = --silent
 MAKEFLAGS += --no-print-directory
@@ -454,7 +460,7 @@ endef
 ##
 
 define ar_lib
-	$(Q) $(MKDIR_P) $(dir $@)
+	$(Q) $(call MkDir,$(dir $@))
 	$(E) "AR" $@
 	$(Q) $(AM_AR) $@ $^
 	$(E) "RANLIB" $@
@@ -464,21 +470,21 @@ endef
 # 1 - dir
 define ProgInstall
 	$(E) "INSTALL" "$< $(1)"
-	$(Q) $(MKDIR_P) $(1)
+	$(Q) $(call MkDir,$(1))
 	$(Q) $(INSTALL_PROGRAM) $< $(1)
 endef
 
 # 1 - dir
 define ScriptInstall
 	$(E) "INSTALL" "$< $(1)"
-	$(Q) $(MKDIR_P) $(1)
+	$(Q) $(call MkDir,$(1))
 	$(Q) $(INSTALL_SCRIPT) $< $(1)
 endef
 
 # 1 - dir
 define DataInstall
 	$(E) "INSTALL" "$< $(1)"
-	$(Q) $(MKDIR_P) $(1)
+	$(Q) $(call MkDir,$(1))
 	$(Q) $(INSTALL_DATA) $< $(1)
 endef
 
@@ -488,7 +494,7 @@ ManInstall = $(call DataInstall,$(1)/man$(call LastWord,$(subst ., ,$<)))
 # 1 - dir
 define LTLibInstall
 	$(E) "INSTALL" "$< $(1)"
-	$(Q) $(MKDIR_P) $(1)
+	$(Q) $(call MkDir,$(1))
 	$(Q) $(LIBTOOLCMD) --mode=install $(INSTALL) $< $(1)
 endef
 
@@ -501,7 +507,7 @@ endef
 define LangObjTarget
 $(trace3)
 $$(OBJDIR)/$(1)/%.o $$(OBJDIR)/$(1)/%.lo: %$(3)
-	$$(Q) $$(MKDIR_P) $$(dir $$@)
+	$$(Q) $$(call MkDir,$$(dir $$@))
 	$$(AM_LANG_$(2)_COMPILE)
 endef
 
@@ -969,7 +975,7 @@ build_$(1): $$($(1)_SOURCES) $$(nodist_$(1)_SOURCES)
 build_$(1): $$($(1)_DEPENDENCIES)
 build_$(1): $$($(1)_FINAL)
 $$($(1)_FINAL): $$($(1)_OBJS)
-	$$(Q) $$(MKDIR_P) $$(dir $$@)
+	$$(Q) $$(call MkDir,$$(dir $$@))
 	$$($(if $(filter LIBRARIES,$(3)),ar_lib,$$($(1)_LINKVAR)))
 
 clean_$(1):
@@ -1073,13 +1079,13 @@ ifneq ($(O),)
 
 # 1-makefile
 define WrapMakeFileCmd
-	@$(MKDIR_P) '$(dir $(O)/$(1))'
-	@printf '%s\n%s\n%s\n%s\n%s\n' \
+	@$(call MkDir,$(dir $(O)/$(1)))
+	@$(call Printf,'%s\n%s\n%s\n%s\n%s\n', \
 		'abs_top_srcdir = $(CURDIR)' \
 		'abs_top_builddir = $(call JoinPath,$(CURDIR),$(O))' \
 		'nosub_top_srcdir = $(call UpDir,$(O))' \
 		'nosub_top_builddir = .' \
-		'include $(abs_top_srcdir)/$(1)' \
+		'include $(abs_top_srcdir)/$(1)') \
 		> $(O)/$(1)
 endef
 
@@ -1266,7 +1272,7 @@ endif
 define MakeSubDir
 	$(trace1)
 	$(E) "MKDIR" "Create $(call JoinPath,$(SUBLOC),$(1))"
-	$(Q) @$(MKDIR_P) $(1)
+	$(Q) @$(call MkDir,$(1))
 	$(Q) @echo "include $(call UpDir,$(1))/$(srcdir)/$(1)/Makefile" > $(1)/Makefile
 endef
 
@@ -1316,7 +1322,7 @@ define MakeDist
 	$(Q) $(MAKE) -s am-check-distfiles
 	$(E) "MKDIR" $(AM_DIST_BASE)
 	$(Q) $(RM) -r -- $(AM_DIST_BASE) $(AM_DIST_BASE).$(AM_DIST_$(1)_EXT)
-	$(Q) $(MKDIR_P) $(AM_DIST_BASE)
+	$(Q) $(call MkDir,$(AM_DIST_BASE))
 	$(E) "COPY" $(AM_DIST_BASE)
 	$(Q) $(MAKE) -s am-show-distfiles | cpio -pmdL --quiet $(AM_DIST_BASE)
 	$(E) "PACK" $(AM_DIST_BASE).$(AM_FORMAT_$(1)_EXT)
@@ -1456,7 +1462,7 @@ $(foreach n,$(AmHelpNames),help-$(n)-local):
 help: $(foreach n,$(AmHelpNames),help-$(n) help-$(n)-local)
 
 # 1-var, 2-desc
-AmConf = @printf '  %-27s  %s=%s\n' $(call ShellQuote,$(2)) $(call ShellQuote,$(1)) $(call ShellQuote,$($(1)))
+AmConf = @$(call Printf,'  %-27s  %s=%s\n',$(call ShellQuote,$(2)) $(call ShellQuote,$(1)) $(call ShellQuote,$($(1))))
 
 help-targets:
 	@echo ""
-- 
2.39.5