Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Tx2ZA-0004st-8u for mharc-grub-devel@gnu.org; Sun, 20 Jan 2013 16:36:36 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx2Z7-0004sR-JH for grub-devel@gnu.org; Sun, 20 Jan 2013 16:36:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tx2Z6-0006Os-6O for grub-devel@gnu.org; Sun, 20 Jan 2013 16:36:33 -0500 Received: from mail-lb0-f179.google.com ([209.85.217.179]:47804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx2Z5-0006Ok-UV for grub-devel@gnu.org; Sun, 20 Jan 2013 16:36:32 -0500 Received: by mail-lb0-f179.google.com with SMTP id gm13so4001828lbb.38 for ; Sun, 20 Jan 2013 13:36:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=7a2XNilsNU+z7wDMGfZIyniBWyj5JQoqh0pCnJPzIwc=; b=gMbXOE5ABNFWgFojqH2BgahOsWuWF+JKIrST2hbF/AYs2RuszelQUk7XXlQyjKzBV/ VNc8orE+Xnf+rPgxScwKxKgOm3oFj5SrgGvwPEsTEPvkDUKtyPbSxzQYap6WKf06vHQq 7jlZIVo2DS9/b0pZJ1xiKGognbNYvsshBd/VOofU3l+RoEfqxNO08fCa/JPSwZ2na679 3K4HIgpa8e5Ca8VlHHd7Fh3CJoxWw3Mukk1TTZYT1xe9NOt6fAN5MxXE4fWi/i3oqjef dab2p9rwIRhIN+oaBS/pBetc8pqU+z5b+3b2rmV54GhZGdB3B738q7c32YtD9Y4zNTC4 oI/Q== X-Received: by 10.112.50.43 with SMTP id z11mr6674862lbn.36.1358717790745; Sun, 20 Jan 2013 13:36:30 -0800 (PST) Received: from localhost.localdomain (ppp91-78-198-46.pppoe.mtu-net.ru. [91.78.198.46]) by mx.google.com with ESMTPS id ml1sm4486889lab.15.2013.01.20.13.36.29 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Jan 2013 13:36:29 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] fix autogen rules Date: Mon, 21 Jan 2013 01:35:12 +0400 Message-Id: <1358717712-10957-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.179 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 21:36:35 -0000 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 --- 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 + + * conf/Makefile.common: Fix autogen rules to pass definition + files on stdin; Makefile.util.am needs Makefile.utilgcry.def + 2013-01-20 Colin Watson 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)