From: Stefano Lattarini Date: Sat, 7 Jul 2012 18:45:52 +0000 (+0200) Subject: [ng] $(am__newline): will not be stripped unexpectedly X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5138db4e2268f69e24fe70e447079c76b3f09940;p=thirdparty%2Fautomake.git [ng] $(am__newline): will not be stripped unexpectedly Not even if placed at the end of another macro's expansion. * lib/am/header-vars.am (am__newline): Improve definition, and update comments. * t/internals.sh: Update: some previously xfailing checks are now passing. Signed-off-by: Stefano Lattarini --- diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index d7afe6fac..0549eaa19 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -50,9 +50,11 @@ am__dquote := " am__squote := ' # "` # Fix font-lock. +# A literal newline character, that does not get stripped if used +# at the end of the expansion of another macro. define am__newline - +$(am__empty) endef ## Makefiles generated by Automake-NG require GNU make >= 3.81. @@ -264,7 +266,7 @@ am__strip_suffixes = $(strip \ ## FIXME: length limits, or at least on a system-by-system basis, might ## FIXME: be better. But don't make it too big, or our implementation ## FIXME: will likely suffer in performance and memory consumption. -# And in the Information Age, we somehow managed to revert an abacus-like +# And in the Information Age, we somehow managed to revert to abacus-like # counting. Yay for us :-) am.max-cmdline-args := xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/t/internals.tap b/t/internals.tap index c94163c48..1012be6a6 100755 --- a/t/internals.tap +++ b/t/internals.tap @@ -193,7 +193,7 @@ command_ok_ am__tolower $MAKE test-tolower command_ok_ am__toupper $MAKE test-toupper command_ok_ am__canon $MAKE test-canonicalize command_ok_ "am__newline (1)" $MAKE test-newline-1 -command_ok_ "am__newline (2)" -D TODO $MAKE test-newline-2 -command_ok_ "am__newline (3)" -D TODO $MAKE test-newline-3 +command_ok_ "am__newline (2)" $MAKE test-newline-2 +command_ok_ "am__newline (3)" $MAKE test-newline-3 :