From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 15:38:12 +0000 (+0530)
Subject: merge menuentry.mod into normal.mod
X-Git-Tag: 1.99~596^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9284756e17c87a76c2ec22b1c59f5e5eab2f3a1b;p=thirdparty%2Fgrub.git

merge menuentry.mod into normal.mod
---

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index bba3503a6..be005378b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1173,6 +1173,8 @@ module = {
   common = script/lexer.c;
   common = script/argv.c;
 
+  common = commands/menuentry.c;
+
   common = unidata.c;
   common_nodist = grub_script.tab.c;
   common_nodist = grub_script.yy.c;
@@ -1408,8 +1410,3 @@ module = {
   name = test_blockarg;
   common = tests/test_blockarg.c;
 };
-
-module = {
-  name = menuentry;
-  common = commands/menuentry.c;
-};
\ No newline at end of file
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index b6662bb96..5e20d4285 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -200,14 +200,16 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 
 static grub_extcmd_t cmd;
 
-GRUB_MOD_INIT(menuentry)
+void
+grub_menu_init (void)
 {
   cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
 			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
 			      N_("BLOCK"), N_("Define a menuentry."), options);
 }
 
-GRUB_MOD_FINI(menuentry)
+void
+grub_menu_fini (void)
 {
   grub_unregister_extcmd (cmd);
 }
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 64d438a91..6a008f577 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -476,6 +476,7 @@ GRUB_MOD_INIT(normal)
 {
   grub_context_init ();
   grub_script_init ();
+  grub_menu_init ();
 
   grub_xputs_saved = grub_xputs;
   grub_xputs = grub_xputs_normal;
@@ -515,6 +516,7 @@ GRUB_MOD_FINI(normal)
 {
   grub_context_fini ();
   grub_script_fini ();
+  grub_menu_fini ();
 
   grub_xputs = grub_xputs_saved;
 
diff --git a/include/grub/menu.h b/include/grub/menu.h
index 9dc257ab7..608253863 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -100,4 +100,7 @@ void grub_menu_execute_with_fallback (grub_menu_t menu,
 void grub_menu_entry_run (grub_menu_entry_t entry);
 int grub_menu_get_default_entry_index (grub_menu_t menu);
 
+void grub_menu_init (void);
+void grub_menu_fini (void);
+
 #endif /* GRUB_MENU_HEADER */