From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Tx3do-00005j-Q6 for mharc-grub-devel@gnu.org; Sun, 20 Jan 2013 17:45:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx3dl-0008VJ-AO for grub-devel@gnu.org; Sun, 20 Jan 2013 17:45:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tx3dj-0005rk-VP for grub-devel@gnu.org; Sun, 20 Jan 2013 17:45:25 -0500 Received: from mail-ea0-f179.google.com ([209.85.215.179]:54180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tx3dj-0005rd-N6 for grub-devel@gnu.org; Sun, 20 Jan 2013 17:45:23 -0500 Received: by mail-ea0-f179.google.com with SMTP id d12so1391813eaa.24 for ; Sun, 20 Jan 2013 14:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:x-enigmail-version:content-type; bh=+s5aGyhA7T81Wq7uO1xQlfJNaZAeCXCGk8F4xttqDLs=; b=uIYUL6FLfAfSbBhjSIjG0eFlmuBRWs94/t0MIOihAr3M61M4MGsgi4YvggYzqVY5a0 rdnDLWtsYb4Trgkg4EjSTQIsf0yqQMBtdWREplGxVZ7sTBPs0CukJDQ9MdkIM0Td/LpX M3XiREBd2Q5NeAvQ84m69JeNZ6xzixVbVPmFrplOoRCQQ5pMGKLKAonE8EiRy1ka4uYf Vm/j3Powx2QeVnPqDr2zbC7M8ByJHJa2R/dX+bHvaqNq8mXDcowCrCqHdBc9t/uiJ/lg vQAD3CNlzsezaDrltZfvra7UoNSigbmE5Ez8QL2OrQcj6lCiU4EkJuZk6ii0Py74mEN8 jnOA== X-Received: by 10.14.176.66 with SMTP id a42mr53357667eem.34.1358721922815; Sun, 20 Jan 2013 14:45:22 -0800 (PST) Received: from debian.x201.phnet (90-165.78-83.cust.bluewin.ch. [83.78.165.90]) by mx.google.com with ESMTPS id l3sm19567932een.14.2013.01.20.14.45.21 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Jan 2013 14:45:22 -0800 (PST) Message-ID: <50FC7375.2080105@gmail.com> Date: Sun, 20 Jan 2013 23:45:09 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.11) Gecko/20121122 Icedove/10.0.11 MIME-Version: 1.0 To: grub-devel@gnu.org Subject: Re: [PATCH] fix autogen rules References: <1358717712-10957-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1358717712-10957-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.4.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigEFB4BCA4FF3DA3796822922F" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.215.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 22:45:27 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigEFB4BCA4FF3DA3796822922F Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 > + > + * conf/Makefile.common: Fix autogen rules to pass definition > + files on stdin; Makefile.util.am needs Makefile.utilgcry.def > + > 2013-01-20 Colin Watson > =20 > 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 $@ > =20 > .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.d= ef | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}'= > $@.new || (rm -f $@.new; exit 1) > mv $@.new $@ > =20 > .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am > $(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Make= file.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Mak= efile.tpl > if [ "x$$GRUB_CONTRIB" !=3D x ]; then echo "You need to run ./autogen= =2Esh manually." >&2; exit 1; fi > - autogen -T $(top_srcdir)/Makefile.tpl $(top_srcdir)/grub-core/Makefil= e.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 $@ --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enigEFB4BCA4FF3DA3796822922F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAlD8c3YACgkQNak7dOguQgkfNwD/e97mrXBk2FF3OarnGAIGs3c+ DA8I3k96MSytvXf1ViYA/3DVi1FAw23m85QOgdWD4r4eHtAOtDfbZ1O2pmE0SqNO =MoAQ -----END PGP SIGNATURE----- --------------enigEFB4BCA4FF3DA3796822922F--