[PATCH] fix autogen rules

[PATCH] fix autogen rules

[Andrey Borzenkov]

1. Makefile.util.am needs Makefile.utilgcry.def

2. autogen takes single definition file as parameter. Change autogen
invocation to match autogen.sh script - pipe all input files instead
of passing them as parameters.

Signed-off-by: Andrey Borzenkov <arvidjaar@gmail.com>

---
 ChangeLog            |    5 +++++
 conf/Makefile.common |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ac8171..5c4bbaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-20  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* conf/Makefile.common: Fix autogen rules to pass definition
+	files on stdin; Makefile.util.am needs Makefile.utilgcry.def
+
 2013-01-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	Remove nested functions from ELF iterators.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 5b9cd92..75c0a5e 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -169,12 +169,12 @@ $(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
 	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/Makefile.util.am
-$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.tpl
-	autogen -T $(top_srcdir)/Makefile.tpl $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
+	cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
 $(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
 	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
-	autogen -T $(top_srcdir)/Makefile.tpl $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
-- 
tg: (6897280..) fu/libgcry-autogen (depends on: master)

Re: [PATCH] fix autogen rules

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 2130 bytes --]

Committed, thanks.
On 20.01.2013 22:35, Andrey Borzenkov wrote:

> diff --git a/ChangeLog b/ChangeLog
> index 3ac8171..5c4bbaf 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,8 @@
> +2013-01-20  Andrey Borzenkov <arvidjaar@gmail.com>
> +
> +	* conf/Makefile.common: Fix autogen rules to pass definition
> +	files on stdin; Makefile.util.am needs Makefile.utilgcry.def
> +
>  2013-01-20  Colin Watson  <cjwatson@ubuntu.com>
>  
>  	Remove nested functions from ELF iterators.
> diff --git a/conf/Makefile.common b/conf/Makefile.common
> index 5b9cd92..75c0a5e 100644
> --- a/conf/Makefile.common
> +++ b/conf/Makefile.common
> @@ -169,12 +169,12 @@ $(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
>  	mv $@.new $@
>  
>  .PRECIOUS: $(top_srcdir)/Makefile.util.am
> -$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.tpl
> -	autogen -T $(top_srcdir)/Makefile.tpl $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
> +$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
> +	cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
>  	mv $@.new $@
>  
>  .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
>  $(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
>  	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
> -	autogen -T $(top_srcdir)/Makefile.tpl $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
> +	cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
>  	mv $@.new $@



-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]