|
 |
f96e0b |
From d79401f4ebfcae849c514bfed11e3562651c8a86 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
f96e0b |
Date: Sun, 20 Jan 2013 23:44:42 +0100
|
|
|
f96e0b |
Subject: [PATCH 122/482] * conf/Makefile.common: Fix autogen rules to
|
|
|
f96e0b |
pass definition files on stdin; Makefile.util.am needs
|
|
|
f96e0b |
Makefile.utilgcry.def
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
conf/Makefile.common | 6 +++---
|
|
|
f96e0b |
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index e82ee8d..4c21ea0 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,8 @@
|
|
|
f96e0b |
+2013-01-20 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * conf/Makefile.common: Fix autogen rules to pass definition
|
|
|
f96e0b |
+ files on stdin; Makefile.util.am needs Makefile.utilgcry.def
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2013-01-20 Leif Lindholm <leif.lindholm@arm.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
* include/grub/elf.h: Update ARM definitions based on binutils.
|
|
|
f96e0b |
diff --git a/conf/Makefile.common b/conf/Makefile.common
|
|
|
f96e0b |
index 5b9cd92..75c0a5e 100644
|
|
|
f96e0b |
--- a/conf/Makefile.common
|
|
|
f96e0b |
+++ b/conf/Makefile.common
|
|
|
f96e0b |
@@ -169,12 +169,12 @@ $(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
|
|
|
f96e0b |
mv $@.new $@
|
|
|
f96e0b |
|
|
|
f96e0b |
.PRECIOUS: $(top_srcdir)/Makefile.util.am
|
|
|
f96e0b |
-$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.tpl
|
|
|
f96e0b |
- autogen -T $(top_srcdir)/Makefile.tpl $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
|
|
|
f96e0b |
+$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
|
|
|
f96e0b |
+ 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)
|
|
|
f96e0b |
mv $@.new $@
|
|
|
f96e0b |
|
|
|
f96e0b |
.PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
|
|
|
f96e0b |
$(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
|
|
|
f96e0b |
if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
|
|
|
f96e0b |
- 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)
|
|
|
f96e0b |
+ 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)
|
|
|
f96e0b |
mv $@.new $@
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|