From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 29 May 2012 22:30:07 +0000 (+0200)
Subject: [ng] yacc/c++: prefer make-time processing over recipe-time one
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9845336c76b380814aca7971498716ed6be91eef;p=thirdparty%2Fautomake.git

[ng] yacc/c++: prefer make-time processing over recipe-time one

* lib/am/yacc.am (am__yacc_c2h): Transform from a sed command to a
make function.
(Rules for Yacc -> C transform): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 4815087c6..e6f21b66c 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -36,9 +36,7 @@ if %?FIRST%
 if %?MAINTAINER-MODE%
 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 endif %?MAINTAINER-MODE%
-## The 's/c$/h/' substitution *must* be the last one.
-am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
-		   -e s/c++$$/h++/ -e s/c$$/h/
+am__yacc_c2h = $(basename $1)$(subst c,h,$(suffix $1))
 endif %?FIRST%
 
 ?GENERIC?%%DERIVED-EXT%: %%EXT%
@@ -49,6 +47,6 @@ endif %?FIRST%
 ?!GENERIC??DIST_SOURCE?	$(am__skipyacc) \
 	$(SHELL) $(YLWRAP) $< \
 	  y.tab.c $@ \
-	  y.tab.h `echo %OBJ% | $(am__yacc_c2h)` \
+	  y.tab.h $(call am__yacc_c2h,$@) \
 	  y.output %BASE%.output \
 	  -- %COMPILE%