Skip to contentSkip to conversation

fix autogen rules

PATCH In review Andrey Borzenkov 2 participants 2 messages Jan 20, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix autogen rules

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.

---
 ChangeLog            |    5 +++++
 conf/Makefile.common |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
ChangeLog +5 -0
index 3ac8171..5c4bbaf 100644
@@ -1,3 +1,8 @@
+2013-01-20  Andrey Borzenkov <[email protected]>
+
+	* conf/Makefile.common: Fix autogen rules to pass definition
+	files on stdin; Makefile.util.am needs Makefile.utilgcry.def
+
 2013-01-20  Colin Watson  <[email protected]>
 
 	Remove nested functions from ELF iterators.
conf/Makefile.common +3 -3
index 5b9cd92..75c0a5e 100644
@@ -169,12 +169,12 @@ $(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
 	mv [email protected] $@
 
 .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;}' > [email protected] || (rm -f [email protected]; 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;}' > [email protected] || (rm -f [email protected]; exit 1)
 	mv [email protected] $@
 
 .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;}' > [email protected] || (rm -f [email protected]; 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;}' > [email protected] || (rm -f [email protected]; exit 1)
 	mv [email protected] $@
Signature · 1 line
tg: (6897280..) fu/libgcry-autogen (depends on: master)
#1 lore raw

Committed, thanks.

Quoted 33 lines · Andrey Borzenkov
ChangeLog +5 -0
index 3ac8171..5c4bbaf 100644
@@ -1,3 +1,8 @@
+2013-01-20  Andrey Borzenkov <[email protected]>
+
+	* conf/Makefile.common: Fix autogen rules to pass definition
+	files on stdin; Makefile.util.am needs Makefile.utilgcry.def
+
 2013-01-20  Colin Watson  <[email protected]>
 
 	Remove nested functions from ELF iterators.
conf/Makefile.common +3 -3
index 5b9cd92..75c0a5e 100644
@@ -169,12 +169,12 @@ $(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
 	mv [email protected] $@
 
 .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;}' > [email protected] || (rm -f [email protected]; 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;}' > [email protected] || (rm -f [email protected]; exit 1)
 	mv [email protected] $@
 
 .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;}' > [email protected] || (rm -f [email protected]; 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;}' > [email protected] || (rm -f [email protected]; exit 1)
 	mv [email protected] $@
Signature · 2 lines
Regards
Vladimir 'φ-coder/phcoder' Serbinenko