From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 18:44:42 +0000 (+0200)
Subject: Merge mainline into legacy_parser
X-Git-Tag: 1.99~490^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=122a9b2cd9bec2a2d4e45a11008fd4796c5cb1c2;p=thirdparty%2Fgrub.git

Merge mainline into legacy_parser
---

122a9b2cd9bec2a2d4e45a11008fd4796c5cb1c2
diff --cc Makefile.util.def
index b4f9fc60e,dd38774fd..d3a4ac290
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@@ -506,14 -541,5 +541,14 @@@ program = 
    common = grub-core/tests/lib/test.c;
    cflags = -Wno-format;
    ldadd = libgrub.a;
-   ldflags = '$(LIBDEVMAPPER)';
+   ldadd = '$(LIBDEVMAPPER)';
  };
 +
 +program = {
 +  name = grub-menulst2cfg;
 +  mansection = 1;
 +  common = util/grub-menulst2cfg.c;
 +  common = grub-core/lib/legacy_parse.c;
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBDEVMAPPER)';
 +};
diff --cc grub-core/Makefile.core.def
index 0ca28eb19,59d99a326..a72f61b66
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1404,9 -1384,21 +1384,29 @@@ module = 
    common = hook/datehook.c;
  };
  
 +module = {
 +  name = legacycfg;
 +  common = commands/legacycfg.c;
 +  common = lib/legacy_parse.c;
 +  enable = i386_pc;
++}
++
+ module = {
+   name = test_blockarg;
+   common = tests/test_blockarg.c;
+ };
+ 
+ module = {
+   name = xzio;
+   common = io/xzio.c;
+   common = lib/xzembed/xz_dec_bcj.c;
+   common = lib/xzembed/xz_dec_lzma2.c;
+   common = lib/xzembed/xz_dec_stream.c;
+   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+ };
+ 
+ module = {
+   name = testload;
+   common = commands/testload.c;
++>>>>>>> MERGE-SOURCE
  };