From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 9 Jan 2013 00:01:53 +0000 (-0500)
Subject: Fix silent-rules alignment in Automake 1.12.
X-Git-Tag: v1~29
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/551b61d2a837bae31c439b2d1abdc3189ad1252e

Fix silent-rules alignment in Automake 1.12.

Automake 1.12 changes the alignment of silent-rules output, which
looks ugly.  Use the new compatibility helpers in dxcommon to fix
the alignment of flex/bison printouts in a backwards-compatible way.
---

diff --git a/Makefile.am b/Makefile.am
index ecfba9b..83b6c6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,13 +159,13 @@ unfuck-distdir:
 
 # Supporting rules for bison/flex.
 
-BISON_V   = $(BISON_V_$(V))
-BISON_V_  = $(BISON_V_$(AM_DEFAULT_VERBOSITY))
-BISON_V_0 = @echo "  BISON " $<;
+BISON_V   = $(BISON_V_@AM_V@)
+BISON_V_  = $(BISON_V_@AM_DEFAULT_V@)
+BISON_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'BISON   ' $<;
 
-FLEX_V   = $(FLEX_V_$(V))
-FLEX_V_  = $(FLEX_V_$(AM_DEFAULT_VERBOSITY))
-FLEX_V_0 = @echo "  FLEX  " $<;
+FLEX_V   = $(FLEX_V_@AM_V@)
+FLEX_V_  = $(FLEX_V_@AM_DEFAULT_V@)
+FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 
 .y.c: ;
 .l.c: ;
diff --git a/common b/common
index 37cea6b..aec6237 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 37cea6bc1a0c2c7a6e73f2ecf8a8a8f0aac605ed
+Subproject commit aec623761eb5cb6ad797259594664fa8aa3d3424
diff --git a/configure.ac b/configure.ac
index 4de7d95..1aae33e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
 AM_SILENT_RULES([yes])
+DX_AUTOMAKE_COMPAT
 
 AC_PROG_CC_C99
 AM_PROG_CC_C_O