commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[2067] 2009-04-05 Vladimir Serbinenko <address@hidden>


From: Vladimir Serbinenko
Subject: [2067] 2009-04-05 Vladimir Serbinenko <address@hidden>
Date: Sun, 05 Apr 2009 20:19:06 +0000

Revision: 2067
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2067
Author:   phcoder
Date:     2009-04-05 20:19:05 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
2009-04-05  Vladimir Serbinenko  <address@hidden>

        Support for mtime and further expandability of dir command

        * include/grub/lib/datetime.h: moved to ...
        * include/grub/datetime.h: ... moved here and added 
        declaration of grub_unixtime2datetime. All users updated
        * include/grub/fs.h: new syntax for dir and mtime functionin 
        struct grub_fs 
        * include/grub/fshelp.h: new declarations of GRUB_FSHELP_TYPE_MASK
        and GRUB_FSHELP_FLAGS_MASK
        * commands/ls.c (grub_ls_list_files): Write mtime in long format
        * fs/ext2.c (grub_ext2_dir): use new dir syntax and supply mtime
        (grub_ext2_mtime): new function
        * fs/hfsplus.c (grub_hfsplus_dir): use new dir syntax and supply mtime
        (grub_hfsplus_mtime): new function
        * fs/ufs.c (GRUB_UFS_ATTR_TYPE): new definition
        (GRUB_UFS_ATTR_FILE): likewise
        (GRUB_UFS_ATTR_LNK): likewise
        (struct grub_ufs_sblock): new fields mtime
        (grub_ufs_read_inode): new parameter to read inode to a separate buffer
        all users updated
        (grub_ufs_dir): mtime support
        (grub_ufs_mtime): new function
        * fs/affs.c (grub_affs_dir): use new dir syntax
        * fs/afs.c (grub_afs_dir): likewise
        * fs/cpio.c (grub_cpio_dir): likewise
        * fs/fat.c (grub_fat_find_dir): likewise
        * fs/hfs.c (grub_hfs_dir): likewise
        * fs/iso9660.c (grub_iso9660_dir): likewise
        * fs/jfs.c (grub_jfs_dir): likewise
        * fs/minix.c (grub_minix_dir): likewise
        * fs/ntfs.c (grub_ntfs_dir): likewise
        * fs/reiserfs.c (grub_reiserfs_dir): likewise
        * fs/sfs.c (grub_sfs_dir): likewise
        * fs/xfs.c (grub_xfs_dir): likewise
        * util/hostfs.c (grub_hostfs_dir): likewise
        * lib/datetime.c: moved to ...
        * normal/datetime.c: ... moved here
        (grub_unixtime2datetime): new function
        * kern/rescue.c (grub_rescue_print_files): use new dir syntax
        * normal/completition.c (iterate_dir): use new dir syntax
        * normal/misc.c (grub_normal_print_device_info): tell the 
        last modification time of a volume
        * kern/fs.c (grub_fs_probe): updated dummy function to use new syntax 
        * conf/common.rmk: added lib/datetime.c to ls.mod
        * conf/i386-coreboot.rmk (grub_emu_SOURCES): add normal/datetime.c  
        (normal_mod_SOURCES): likewise
        (datetime_mod_SOURCES): Removed lib/datetime.c
        * conf/i386-efi.rmk: likewise
        * conf/i386-ieee1275.rmk: likewise      
        * conf/i386-pc.rmk: likewise
        * conf/powerpc-ieee1275.rmk: likewise
        * conf/sparc64-ieee1275.rmk: likewise   
        * conf/x86_64-efi.rmk: likewise 

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/DISTLIST
    trunk/grub2/commands/date.c
    trunk/grub2/commands/ls.c
    trunk/grub2/conf/i386-coreboot.mk
    trunk/grub2/conf/i386-coreboot.rmk
    trunk/grub2/conf/i386-efi.mk
    trunk/grub2/conf/i386-efi.rmk
    trunk/grub2/conf/i386-ieee1275.mk
    trunk/grub2/conf/i386-ieee1275.rmk
    trunk/grub2/conf/i386-pc.mk
    trunk/grub2/conf/i386-pc.rmk
    trunk/grub2/conf/powerpc-ieee1275.mk
    trunk/grub2/conf/powerpc-ieee1275.rmk
    trunk/grub2/conf/sparc64-ieee1275.mk
    trunk/grub2/conf/sparc64-ieee1275.rmk
    trunk/grub2/conf/x86_64-efi.mk
    trunk/grub2/conf/x86_64-efi.rmk
    trunk/grub2/fs/affs.c
    trunk/grub2/fs/afs.c
    trunk/grub2/fs/cpio.c
    trunk/grub2/fs/ext2.c
    trunk/grub2/fs/fat.c
    trunk/grub2/fs/hfs.c
    trunk/grub2/fs/hfsplus.c
    trunk/grub2/fs/iso9660.c
    trunk/grub2/fs/jfs.c
    trunk/grub2/fs/minix.c
    trunk/grub2/fs/ntfs.c
    trunk/grub2/fs/reiserfs.c
    trunk/grub2/fs/sfs.c
    trunk/grub2/fs/udf.c
    trunk/grub2/fs/ufs.c
    trunk/grub2/fs/xfs.c
    trunk/grub2/hook/datehook.c
    trunk/grub2/include/grub/fs.h
    trunk/grub2/include/grub/fshelp.h
    trunk/grub2/include/grub/lib/datetime.h
    trunk/grub2/kern/corecmd.c
    trunk/grub2/kern/fs.c
    trunk/grub2/lib/datetime.c
    trunk/grub2/lib/efi/datetime.c
    trunk/grub2/lib/i386/datetime.c
    trunk/grub2/normal/completion.c
    trunk/grub2/normal/misc.c
    trunk/grub2/util/hostfs.c

Added Paths:
-----------
    trunk/grub2/include/grub/datetime.h
    trunk/grub2/normal/datetime.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/ChangeLog       2009-04-05 20:19:05 UTC (rev 2067)
@@ -1,5 +1,61 @@
 2009-04-05  Vladimir Serbinenko  <address@hidden>
 
+       Support for mtime and further expandability of dir command
+
+       * include/grub/lib/datetime.h: moved to ...
+       * include/grub/datetime.h: ... moved here and added 
+       declaration of grub_unixtime2datetime. All users updated
+       * include/grub/fs.h: new syntax for dir and mtime functionin 
+       struct grub_fs 
+       * include/grub/fshelp.h: new declarations of GRUB_FSHELP_TYPE_MASK
+       and GRUB_FSHELP_FLAGS_MASK
+       * commands/ls.c (grub_ls_list_files): Write mtime in long format
+       * fs/ext2.c (grub_ext2_dir): use new dir syntax and supply mtime
+       (grub_ext2_mtime): new function
+       * fs/hfsplus.c (grub_hfsplus_dir): use new dir syntax and supply mtime
+       (grub_hfsplus_mtime): new function
+       * fs/ufs.c (GRUB_UFS_ATTR_TYPE): new definition
+       (GRUB_UFS_ATTR_FILE): likewise
+       (GRUB_UFS_ATTR_LNK): likewise
+       (struct grub_ufs_sblock): new fields mtime
+       (grub_ufs_read_inode): new parameter to read inode to a separate buffer
+       all users updated
+       (grub_ufs_dir): mtime support
+       (grub_ufs_mtime): new function
+       * fs/affs.c (grub_affs_dir): use new dir syntax
+       * fs/afs.c (grub_afs_dir): likewise
+       * fs/cpio.c (grub_cpio_dir): likewise
+       * fs/fat.c (grub_fat_find_dir): likewise
+       * fs/hfs.c (grub_hfs_dir): likewise
+       * fs/iso9660.c (grub_iso9660_dir): likewise
+       * fs/jfs.c (grub_jfs_dir): likewise
+       * fs/minix.c (grub_minix_dir): likewise
+       * fs/ntfs.c (grub_ntfs_dir): likewise
+       * fs/reiserfs.c (grub_reiserfs_dir): likewise
+       * fs/sfs.c (grub_sfs_dir): likewise
+       * fs/xfs.c (grub_xfs_dir): likewise
+       * util/hostfs.c (grub_hostfs_dir): likewise
+       * lib/datetime.c: moved to ...
+       * normal/datetime.c: ... moved here
+       (grub_unixtime2datetime): new function
+       * kern/rescue.c (grub_rescue_print_files): use new dir syntax
+       * normal/completition.c (iterate_dir): use new dir syntax
+       * normal/misc.c (grub_normal_print_device_info): tell the 
+       last modification time of a volume
+       * kern/fs.c (grub_fs_probe): updated dummy function to use new syntax 
+       * conf/common.rmk: added lib/datetime.c to ls.mod
+       * conf/i386-coreboot.rmk (grub_emu_SOURCES): add normal/datetime.c  
+       (normal_mod_SOURCES): likewise
+       (datetime_mod_SOURCES): Removed lib/datetime.c
+       * conf/i386-efi.rmk: likewise
+       * conf/i386-ieee1275.rmk: likewise      
+       * conf/i386-pc.rmk: likewise
+       * conf/powerpc-ieee1275.rmk: likewise
+       * conf/sparc64-ieee1275.rmk: likewise   
+       * conf/x86_64-efi.rmk: likewise 
+
+2009-04-05  Vladimir Serbinenko  <address@hidden>
+
        Trim trailing spaces in FAT label and support mtools-like labels
        
        * fs/fat.c (grub_fat_iterate_dir): New function based 

Modified: trunk/grub2/DISTLIST
===================================================================
--- trunk/grub2/DISTLIST        2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/DISTLIST        2009-04-05 20:19:05 UTC (rev 2067)
@@ -148,6 +148,7 @@
 include/grub/bufio.h
 include/grub/cache.h
 include/grub/command.h
+include/grub/datetime.h
 include/grub/device.h
 include/grub/disk.h
 include/grub/dl.h
@@ -406,6 +407,7 @@
 normal/color.c
 normal/command.c
 normal/completion.c
+normal/datetime.c
 normal/execute.c
 normal/function.c
 normal/lexer.c

Modified: trunk/grub2/commands/date.c
===================================================================
--- trunk/grub2/commands/date.c 2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/commands/date.c 2009-04-05 20:19:05 UTC (rev 2067)
@@ -20,7 +20,7 @@
 #include <grub/dl.h>
 #include <grub/err.h>
 #include <grub/misc.h>
-#include <grub/lib/datetime.h>
+#include <grub/datetime.h>
 #include <grub/command.h>
 
 #define GRUB_DATETIME_SET_YEAR         1

Modified: trunk/grub2/commands/ls.c
===================================================================
--- trunk/grub2/commands/ls.c   2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/commands/ls.c   2009-04-05 20:19:05 UTC (rev 2067)
@@ -29,6 +29,7 @@
 #include <grub/file.h>
 #include <grub/normal.h>
 #include <grub/extcmd.h>
+#include <grub/datetime.h>
 
 static const struct grub_arg_option options[] =
   {
@@ -68,25 +69,29 @@
   grub_fs_t fs;
   const char *path;
   grub_device_t dev;
-  auto int print_files (const char *filename, int dir);
-  auto int print_files_long (const char *filename, int dir);
+
+  auto int print_files (const char *filename, 
+                       const struct grub_dirhook_info *info);
+  auto int print_files_long (const char *filename, 
+                            const struct grub_dirhook_info *info);
   
-  int print_files (const char *filename, int dir)
+  int print_files (const char *filename, const struct grub_dirhook_info *info)
     {
       if (all || filename[0] != '.')
-       grub_printf ("%s%s ", filename, dir ? "/" : "");
+       grub_printf ("%s%s ", filename, info->dir ? "/" : "");
       
       return 0;
     }
      
-  int print_files_long (const char *filename, int dir)
+  int print_files_long (const char *filename, 
+                       const struct grub_dirhook_info *info)
     {
       char pathname[grub_strlen (dirname) + grub_strlen (filename) + 1];
 
       if ((! all) && (filename[0] == '.'))
        return 0;
 
-      if (! dir)
+      if (! info->dir)
        {
          grub_file_t file;
          
@@ -138,7 +143,23 @@
       else
        grub_printf ("%-12s", "DIR");
 
-      grub_printf ("%s%s\n", filename, dir ? "/" : "");
+      if (info->mtimeset)
+       {
+         struct grub_datetime datetime;
+         grub_unixtime2datetime (info->mtime, &datetime);
+         if (human)
+           grub_printf (" %d-%02d-%02d %02d:%02d:%02d %-11s ",
+                        datetime.year, datetime.month, datetime.day,
+                        datetime.hour, datetime.minute, 
+                        datetime.second,
+                        grub_get_weekday_name (&datetime));
+         else
+           grub_printf (" %04d%02d%02d%02d%02d%02d ",
+                        datetime.year, datetime.month, 
+                        datetime.day, datetime.hour, 
+                        datetime.minute, datetime.second);
+       }
+      grub_printf ("%s%s\n", filename, info->dir ? "/" : "");
 
       return 0;
     }
@@ -181,7 +202,7 @@
          /* PATH might be a regular file.  */
          char *p;
          grub_file_t file;
-
+         struct grub_dirhook_info info;
          grub_errno = 0;
          
          file = grub_file_open (dirname);
@@ -196,10 +217,11 @@
            goto fail;
 
          all = 1;
+         grub_memset (&info, 0, sizeof (info));
          if (longlist)
-           print_files_long (p, 0);
+           print_files_long (p, &info);
          else
-           print_files (p, 0);
+           print_files (p, &info);
 
          grub_free (dirname);
        }

Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk   2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-coreboot.mk   2009-04-05 20:19:05 UTC (rev 2067)
@@ -225,7 +225,8 @@
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
        lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
-       normal/completion.c normal/main.c normal/menu_text.c            \
+       normal/completion.c normal/datetime.c normal/main.c             \
+       normal/menu_text.c              \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/misc.c normal/script.c                                   \
        normal/color.c                                                  \
@@ -238,11 +239,11 @@
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d 
grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d 
grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d 
grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d grub_emu-fs_minix.d 
grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d 
grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_afs.d 
grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d 
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d 
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_function.d 
grub_emu-normal_completion.d grub_emu-normal_main.d grub_emu-normal_menu_text.d 
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d 
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d 
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d 
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d 
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d 
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_datetime.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d 
grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d 
grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d 
grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d grub_emu-fs_minix.d 
grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d 
grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_afs.d 
grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d 
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d 
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_function.d 
grub_emu-normal_completion.d grub_emu-normal_datetime.d grub_emu-normal_main.d 
grub_emu-normal_menu_text.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d 
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d 
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d 
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d 
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d 
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_emu_init.d
 
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
-       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_datetime.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
+       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o 
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o 
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o 
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o 
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o 
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_datetime.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
 
 grub_emu-commands_minicmd.o: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES)
        $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) 
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -500,6 +501,10 @@
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_completion.d
 
+grub_emu-normal_datetime.o: normal/datetime.c $(normal/datetime.c_DEPENDENCIES)
+       $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_datetime.d
+
 grub_emu-normal_main.o: normal/main.c $(normal/main.c_DEPENDENCIES)
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_main.d
@@ -697,7 +702,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -705,12 +710,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_datetime.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -719,9 +724,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_datetime.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -795,6 +800,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_execute.o: normal/execute.c $(normal/execute.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_execute.d
@@ -1736,13 +1760,13 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
-CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o und-datetime.lst
+datetime_mod_SOURCES = lib/i386/datetime.c
+CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_i386_datetime.o und-datetime.lst
 ifneq ($(datetime_mod_EXPORTS),no)
 CLEANFILES += def-datetime.lst
 DEFSYMFILES += def-datetime.lst
 endif
-MOSTLYCLEANFILES += datetime_mod-lib_datetime.d 
datetime_mod-lib_i386_datetime.d
+MOSTLYCLEANFILES += datetime_mod-lib_i386_datetime.d
 UNDSYMFILES += und-datetime.lst
 
 datetime.mod: pre-datetime.o mod-datetime.o $(TARGET_OBJ2ELF)
@@ -1751,9 +1775,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_datetime.o 
datetime_mod-lib_i386_datetime.o
+pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_i386_datetime.o
        -rm -f $@
-       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o
+       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_i386_datetime.o
 
 mod-datetime.o: mod-datetime.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) 
-c -o $@ $<
@@ -1770,25 +1794,6 @@
        echo 'datetime' > $@
        $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
 
-datetime_mod-lib_datetime.o: lib/datetime.c $(lib/datetime.c_DEPENDENCIES)
-       $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(datetime_mod_CFLAGS) -MD -c -o $@ $<
--include datetime_mod-lib_datetime.d
-
-CLEANFILES += cmd-datetime_mod-lib_datetime.lst 
fs-datetime_mod-lib_datetime.lst partmap-datetime_mod-lib_datetime.lst
-COMMANDFILES += cmd-datetime_mod-lib_datetime.lst
-FSFILES += fs-datetime_mod-lib_datetime.lst
-PARTMAPFILES += partmap-datetime_mod-lib_datetime.lst
-
-cmd-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-fs-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-partmap-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh datetime > $@ || (rm -f $@; exit 1)
-
-
 datetime_mod-lib_i386_datetime.o: lib/i386/datetime.c 
$(lib/i386/datetime.c_DEPENDENCIES)
        $(TARGET_CC) -Ilib/i386 -I$(srcdir)/lib/i386 $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -MD -c -o $@ $<
 -include datetime_mod-lib_i386_datetime.d

Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk  2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-coreboot.rmk  2009-04-05 20:19:05 UTC (rev 2067)
@@ -76,7 +76,8 @@
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
        lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
-       normal/completion.c normal/main.c normal/menu_text.c            \
+       normal/completion.c normal/datetime.c normal/main.c             \
+       normal/menu_text.c              \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/misc.c normal/script.c                                   \
        normal/color.c                                                  \
@@ -116,7 +117,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -184,7 +185,7 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
+datetime_mod_SOURCES = lib/i386/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

Modified: trunk/grub2/conf/i386-efi.mk
===================================================================
--- trunk/grub2/conf/i386-efi.mk        2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-efi.mk        2009-04-05 20:19:05 UTC (rev 2067)
@@ -85,7 +85,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c   \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c       \
        normal/completion.c normal/context.c normal/main.c              \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c                                              \
@@ -819,7 +820,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -827,12 +828,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_datetime.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -841,9 +842,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_datetime.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -917,6 +918,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_execute.o: normal/execute.c $(normal/execute.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_execute.d
@@ -1568,13 +1588,13 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/efi/datetime.c
-CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_datetime.o datetime_mod-lib_efi_datetime.o und-datetime.lst
+datetime_mod_SOURCES = lib/efi/datetime.c
+CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_efi_datetime.o und-datetime.lst
 ifneq ($(datetime_mod_EXPORTS),no)
 CLEANFILES += def-datetime.lst
 DEFSYMFILES += def-datetime.lst
 endif
-MOSTLYCLEANFILES += datetime_mod-lib_datetime.d datetime_mod-lib_efi_datetime.d
+MOSTLYCLEANFILES += datetime_mod-lib_efi_datetime.d
 UNDSYMFILES += und-datetime.lst
 
 datetime.mod: pre-datetime.o mod-datetime.o $(TARGET_OBJ2ELF)
@@ -1583,9 +1603,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_datetime.o 
datetime_mod-lib_efi_datetime.o
+pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_efi_datetime.o
        -rm -f $@
-       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_datetime.o datetime_mod-lib_efi_datetime.o
+       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_efi_datetime.o
 
 mod-datetime.o: mod-datetime.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) 
-c -o $@ $<
@@ -1602,25 +1622,6 @@
        echo 'datetime' > $@
        $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
 
-datetime_mod-lib_datetime.o: lib/datetime.c $(lib/datetime.c_DEPENDENCIES)
-       $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(datetime_mod_CFLAGS) -MD -c -o $@ $<
--include datetime_mod-lib_datetime.d
-
-CLEANFILES += cmd-datetime_mod-lib_datetime.lst 
fs-datetime_mod-lib_datetime.lst partmap-datetime_mod-lib_datetime.lst
-COMMANDFILES += cmd-datetime_mod-lib_datetime.lst
-FSFILES += fs-datetime_mod-lib_datetime.lst
-PARTMAPFILES += partmap-datetime_mod-lib_datetime.lst
-
-cmd-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-fs-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-partmap-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh datetime > $@ || (rm -f $@; exit 1)
-
-
 datetime_mod-lib_efi_datetime.o: lib/efi/datetime.c 
$(lib/efi/datetime.c_DEPENDENCIES)
        $(TARGET_CC) -Ilib/efi -I$(srcdir)/lib/efi $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -MD -c -o $@ $<
 -include datetime_mod-lib_efi_datetime.d

Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk       2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-efi.rmk       2009-04-05 20:19:05 UTC (rev 2067)
@@ -52,7 +52,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c   \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c       \
        normal/completion.c normal/context.c normal/main.c              \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c                                              \
@@ -120,7 +121,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -168,7 +169,7 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/efi/datetime.c
+datetime_mod_SOURCES = lib/efi/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

Modified: trunk/grub2/conf/i386-ieee1275.mk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.mk   2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-ieee1275.mk   2009-04-05 20:19:05 UTC (rev 2067)
@@ -224,7 +224,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c\
        normal/completion.c normal/main.c normal/menu_text.c            \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/misc.c normal/script.c                                   \
@@ -238,11 +239,11 @@
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_halt.d grub_emu-commands_reboot.d 
grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d grub_emu-disk_loopback.d 
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d 
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d 
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d 
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d 
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_function.d 
grub_emu-normal_completion.d grub_emu-normal_main.d grub_emu-normal_menu_text.d 
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d 
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d 
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d 
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d 
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d 
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_halt.d grub_emu-commands_reboot.d 
grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d grub_emu-disk_loopback.d 
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d 
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d 
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d 
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d 
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_datetime.d 
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d 
grub_emu-normal_menu_text.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d 
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d 
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d 
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d 
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d 
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_emu_init.d
 
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
-       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o
+       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o 
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o 
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o 
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o 
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o 
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o 
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o 
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o 
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
 
 grub_emu-commands_minicmd.o: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES)
        $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) 
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -500,6 +501,10 @@
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_command.d
 
+grub_emu-normal_datetime.o: normal/datetime.c $(normal/datetime.c_DEPENDENCIES)
+       $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_datetime.d
+
 grub_emu-normal_function.o: normal/function.c $(normal/function.c_DEPENDENCIES)
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_function.d
@@ -650,7 +655,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -658,12 +663,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_datetime.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -672,9 +677,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_datetime.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -748,6 +753,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_execute.o: normal/execute.c $(normal/execute.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_execute.d
@@ -1688,13 +1712,13 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
-CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o und-datetime.lst
+datetime_mod_SOURCES = lib/i386/datetime.c
+CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_i386_datetime.o und-datetime.lst
 ifneq ($(datetime_mod_EXPORTS),no)
 CLEANFILES += def-datetime.lst
 DEFSYMFILES += def-datetime.lst
 endif
-MOSTLYCLEANFILES += datetime_mod-lib_datetime.d 
datetime_mod-lib_i386_datetime.d
+MOSTLYCLEANFILES += datetime_mod-lib_i386_datetime.d
 UNDSYMFILES += und-datetime.lst
 
 datetime.mod: pre-datetime.o mod-datetime.o $(TARGET_OBJ2ELF)
@@ -1703,9 +1727,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_datetime.o 
datetime_mod-lib_i386_datetime.o
+pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_i386_datetime.o
        -rm -f $@
-       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o
+       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_i386_datetime.o
 
 mod-datetime.o: mod-datetime.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) 
-c -o $@ $<
@@ -1722,25 +1746,6 @@
        echo 'datetime' > $@
        $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
 
-datetime_mod-lib_datetime.o: lib/datetime.c $(lib/datetime.c_DEPENDENCIES)
-       $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(datetime_mod_CFLAGS) -MD -c -o $@ $<
--include datetime_mod-lib_datetime.d
-
-CLEANFILES += cmd-datetime_mod-lib_datetime.lst 
fs-datetime_mod-lib_datetime.lst partmap-datetime_mod-lib_datetime.lst
-COMMANDFILES += cmd-datetime_mod-lib_datetime.lst
-FSFILES += fs-datetime_mod-lib_datetime.lst
-PARTMAPFILES += partmap-datetime_mod-lib_datetime.lst
-
-cmd-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-fs-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-partmap-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh datetime > $@ || (rm -f $@; exit 1)
-
-
 datetime_mod-lib_i386_datetime.o: lib/i386/datetime.c 
$(lib/i386/datetime.c_DEPENDENCIES)
        $(TARGET_CC) -Ilib/i386 -I$(srcdir)/lib/i386 $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -MD -c -o $@ $<
 -include datetime_mod-lib_i386_datetime.d

Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk  2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-ieee1275.rmk  2009-04-05 20:19:05 UTC (rev 2067)
@@ -75,7 +75,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c\
        normal/completion.c normal/main.c normal/menu_text.c            \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/misc.c normal/script.c                                   \
@@ -113,7 +114,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -185,7 +186,7 @@
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
+datetime_mod_SOURCES = lib/i386/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

Modified: trunk/grub2/conf/i386-pc.mk
===================================================================
--- trunk/grub2/conf/i386-pc.mk 2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-pc.mk 2009-04-05 20:19:05 UTC (rev 2067)
@@ -551,7 +551,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c   \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c       \
        normal/completion.c normal/main.c normal/color.c                \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c                                              \
@@ -571,11 +572,11 @@
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_color.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d 
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d 
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d 
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d 
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_function.d 
grub_emu-normal_completion.d grub_emu-normal_main.d grub_emu-normal_color.d 
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_menu_text.d 
grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-partmap_amiga.d 
grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d 
grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d grub_emu-fs_affs.d 
grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d 
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d 
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d 
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d 
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d 
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d 
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d 
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d 
grub_emu-commands_help.d grub_emu-commands_handler.d grub_emu-commands_ls.d 
grub_emu-commands_test.d grub_emu-commands_search.d 
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d 
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d 
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d 
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d 
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d 
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d 
grub_emu-kern_list.d grub_emu-kern_handler.d grub_emu-kern_command.d 
grub_emu-kern_corecmd.d grub_emu-commands_extcmd.d grub_emu-normal_execute.d 
grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d 
grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-lib_arg.d 
grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_datetime.d 
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d 
grub_emu-normal_color.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_menu_text.d 
grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-partmap_amiga.d 
grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d 
grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d grub_emu-fs_affs.d 
grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d 
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d 
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d 
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d 
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d 
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d 
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d 
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
 
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_color.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
-       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o 
grub_emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_color.o 
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o 
$(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_handler.o 
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o 
grub_emu-commands_help.o grub_emu-commands_handler.o grub_emu-commands_ls.o 
grub_emu-commands_test.o grub_emu-commands_search.o 
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o 
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o 
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o 
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o 
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o 
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o 
grub_emu-kern_list.o grub_emu-kern_handler.o grub_emu-kern_command.o 
grub_emu-kern_corecmd.o grub_emu-commands_extcmd.o grub_emu-normal_execute.o 
grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o 
grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-lib_arg.o 
grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o 
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o 
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o 
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o 
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o 
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o 
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o 
$(LDFLAGS) $(grub_emu_LDFLAGS)
 
 grub_emu-commands_minicmd.o: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES)
        $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) 
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -765,6 +766,10 @@
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_command.d
 
+grub_emu-normal_datetime.o: normal/datetime.c $(normal/datetime.c_DEPENDENCIES)
+       $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_datetime.d
+
 grub_emu-normal_function.o: normal/function.c $(normal/function.c_DEPENDENCIES)
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_function.d
@@ -1254,7 +1259,7 @@
 # Please put arch dependant part of normal.mod at the end of list to
 # keep it simpler to update to different architectures.
 #
-normal_mod_SOURCES = normal/cmdline.c normal/command.c \
+normal_mod_SOURCES = normal/cmdline.c normal/command.c normal/datetime.c \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
@@ -1263,12 +1268,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_datetime.d normal_mod-normal_completion.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -1277,9 +1282,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_datetime.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_i386_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -1334,6 +1339,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_completion.o: normal/completion.c 
$(normal/completion.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_completion.d
@@ -3093,13 +3117,13 @@
 pxecmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
-CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o und-datetime.lst
+datetime_mod_SOURCES = lib/i386/datetime.c
+CLEANFILES += datetime.mod mod-datetime.o mod-datetime.c pre-datetime.o 
datetime_mod-lib_i386_datetime.o und-datetime.lst
 ifneq ($(datetime_mod_EXPORTS),no)
 CLEANFILES += def-datetime.lst
 DEFSYMFILES += def-datetime.lst
 endif
-MOSTLYCLEANFILES += datetime_mod-lib_datetime.d 
datetime_mod-lib_i386_datetime.d
+MOSTLYCLEANFILES += datetime_mod-lib_i386_datetime.d
 UNDSYMFILES += und-datetime.lst
 
 datetime.mod: pre-datetime.o mod-datetime.o $(TARGET_OBJ2ELF)
@@ -3108,9 +3132,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_datetime.o 
datetime_mod-lib_i386_datetime.o
+pre-datetime.o: $(datetime_mod_DEPENDENCIES) datetime_mod-lib_i386_datetime.o
        -rm -f $@
-       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_datetime.o datetime_mod-lib_i386_datetime.o
+       $(TARGET_CC) $(datetime_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
datetime_mod-lib_i386_datetime.o
 
 mod-datetime.o: mod-datetime.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) 
-c -o $@ $<
@@ -3127,25 +3151,6 @@
        echo 'datetime' > $@
        $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
 
-datetime_mod-lib_datetime.o: lib/datetime.c $(lib/datetime.c_DEPENDENCIES)
-       $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(datetime_mod_CFLAGS) -MD -c -o $@ $<
--include datetime_mod-lib_datetime.d
-
-CLEANFILES += cmd-datetime_mod-lib_datetime.lst 
fs-datetime_mod-lib_datetime.lst partmap-datetime_mod-lib_datetime.lst
-COMMANDFILES += cmd-datetime_mod-lib_datetime.lst
-FSFILES += fs-datetime_mod-lib_datetime.lst
-PARTMAPFILES += partmap-datetime_mod-lib_datetime.lst
-
-cmd-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-fs-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh 
datetime > $@ || (rm -f $@; exit 1)
-
-partmap-datetime_mod-lib_datetime.lst: lib/datetime.c 
$(lib/datetime.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh datetime > $@ || (rm -f $@; exit 1)
-
-
 datetime_mod-lib_i386_datetime.o: lib/i386/datetime.c 
$(lib/i386/datetime.c_DEPENDENCIES)
        $(TARGET_CC) -Ilib/i386 -I$(srcdir)/lib/i386 $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(datetime_mod_CFLAGS) -MD -c -o $@ $<
 -include datetime_mod-lib_i386_datetime.d

Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk        2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/i386-pc.rmk        2009-04-05 20:19:05 UTC (rev 2067)
@@ -128,7 +128,8 @@
        normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c   \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
+       normal/function.c       \
        normal/completion.c normal/main.c normal/color.c                \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c                                              \
@@ -203,7 +204,7 @@
 # Please put arch dependant part of normal.mod at the end of list to
 # keep it simpler to update to different architectures.
 #
-normal_mod_SOURCES = normal/cmdline.c normal/command.c \
+normal_mod_SOURCES = normal/cmdline.c normal/command.c normal/datetime.c \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
@@ -338,7 +339,7 @@
 pxecmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
+datetime_mod_SOURCES = lib/i386/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

Modified: trunk/grub2/conf/powerpc-ieee1275.mk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.mk        2009-04-05 15:34:30 UTC (rev 
2066)
+++ trunk/grub2/conf/powerpc-ieee1275.mk        2009-04-05 20:19:05 UTC (rev 
2067)
@@ -72,7 +72,7 @@
        kern/misc.c kern/parser.c kern/partition.c kern/rescue.c        \
        kern/term.c kern/list.c kern/handler.c fs/fshelp.c              \
        kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       lib/arg.c normal/cmdline.c normal/command.c                     \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
@@ -88,11 +88,11 @@
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
        grub_script.tab.c grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_handler.o 
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_completion.o 
grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o 
grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu_entry.o grub_emu-normal_menu_viewer.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o 
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o 
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d 
grub_emu-commands_search.d grub_emu-commands_handler.d grub_emu-commands_test.d 
grub_emu-commands_ls.d grub_emu-commands_blocklist.d 
grub_emu-commands_hexdump.d grub_emu-lib_hexdump.d grub_emu-commands_halt.d 
grub_emu-commands_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d 
grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d 
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d 
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-io_gzio.d grub_emu-kern_device.d 
grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d 
grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d 
grub_emu-kern_term.d grub_emu-kern_list.d grub_emu-kern_handler.d 
grub_emu-fs_fshelp.d grub_emu-kern_command.d grub_emu-kern_corecmd.d 
grub_emu-commands_extcmd.d grub_emu-lib_arg.d grub_emu-normal_cmdline.d 
grub_emu-normal_command.d grub_emu-normal_completion.d 
grub_emu-normal_execute.d grub_emu-normal_function.d grub_emu-normal_lexer.d 
grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_text.d 
grub_emu-normal_menu_entry.d grub_emu-normal_menu_viewer.d 
grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-normal_color.d 
grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d 
grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-util_console.d 
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d 
grub_emu-util_hostdisk.d grub_emu-util_getroot.d 
grub_emu-util_powerpc_ieee1275_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_handler.o 
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_completion.o grub_emu-normal_execute.o 
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o 
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o 
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_minicmd.d grub_emu-commands_cat.d 
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d 
grub_emu-commands_search.d grub_emu-commands_handler.d grub_emu-commands_test.d 
grub_emu-commands_ls.d grub_emu-commands_blocklist.d 
grub_emu-commands_hexdump.d grub_emu-lib_hexdump.d grub_emu-commands_halt.d 
grub_emu-commands_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d 
grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d 
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d 
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d 
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d 
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-io_gzio.d grub_emu-kern_device.d 
grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d 
grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d 
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d 
grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d 
grub_emu-kern_term.d grub_emu-kern_list.d grub_emu-kern_handler.d 
grub_emu-fs_fshelp.d grub_emu-kern_command.d grub_emu-kern_corecmd.d 
grub_emu-commands_extcmd.d grub_emu-lib_arg.d grub_emu-normal_cmdline.d 
grub_emu-normal_command.d grub_emu-normal_datetime.d 
grub_emu-normal_completion.d grub_emu-normal_execute.d 
grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-normal_main.d 
grub_emu-normal_menu.d grub_emu-normal_menu_text.d grub_emu-normal_menu_entry.d 
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d 
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d 
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d 
grub_emu-util_console.d grub_emu-util_hostfs.d grub_emu-util_grub_emu.d 
grub_emu-util_misc.d grub_emu-util_hostdisk.d grub_emu-util_getroot.d 
grub_emu-util_powerpc_ieee1275_misc.d grub_emu-disk_raid.d 
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d 
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d 
grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
 
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_handler.o 
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_completion.o 
grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o 
grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu_entry.o grub_emu-normal_menu_viewer.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o 
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o 
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
-       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o 
grub_emu-commands_search.o grub_emu-commands_handler.o grub_emu-commands_test.o 
grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_completion.o 
grub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o 
grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_text.o 
grub_emu-normal_menu_entry.o grub_emu-normal_menu_viewer.o 
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-normal_color.o 
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o 
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-util_console.o 
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o 
grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS) 
$(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_minicmd.o 
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o 
grub_emu-commands_help.o grub_emu-commands_search.o grub_emu-commands_handler.o 
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_completion.o grub_emu-normal_execute.o 
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o 
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o 
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+       $(CC) -o $@ grub_emu-commands_minicmd.o grub_emu-commands_cat.o 
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o 
grub_emu-commands_search.o grub_emu-commands_handler.o grub_emu-commands_test.o 
grub_emu-commands_ls.o grub_emu-commands_blocklist.o 
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o 
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o 
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o 
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o 
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o 
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o 
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o 
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o 
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o 
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o 
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o 
grub_emu-kern_term.o grub_emu-kern_list.o grub_emu-kern_handler.o 
grub_emu-fs_fshelp.o grub_emu-kern_command.o grub_emu-kern_corecmd.o 
grub_emu-commands_extcmd.o grub_emu-lib_arg.o grub_emu-normal_cmdline.o 
grub_emu-normal_command.o grub_emu-normal_datetime.o 
grub_emu-normal_completion.o grub_emu-normal_execute.o 
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o 
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o 
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o 
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o 
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o 
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o 
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o 
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o 
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o 
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o 
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS) 
$(grub_emu_LDFLAGS)
 
 grub_emu-commands_minicmd.o: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES)
        $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) 
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -326,6 +326,10 @@
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_command.d
 
+grub_emu-normal_datetime.o: normal/datetime.c $(normal/datetime.c_DEPENDENCIES)
+       $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_datetime.d
+
 grub_emu-normal_completion.o: normal/completion.c 
$(normal/completion.c_DEPENDENCIES)
        $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 
$(grub_emu_CFLAGS) -MD -c -o $@ $<
 -include grub_emu-normal_completion.d
@@ -705,7 +709,7 @@
 # Please put arch dependant part of normal.mod at the end of list to
 # keep it simpler to update to different architectures.
 #
-normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
+normal_mod_SOURCES = normal/cmdline.c normal/command.c normal/datetime.c \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
@@ -714,12 +718,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/powerpc/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_powerpc_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_powerpc_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_datetime.d normal_mod-normal_completion.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_powerpc_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -728,9 +732,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_datetime.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_powerpc_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_powerpc_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -785,6 +789,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_completion.o: normal/completion.c 
$(normal/completion.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_completion.d

Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk       2009-04-05 15:34:30 UTC (rev 
2066)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk       2009-04-05 20:19:05 UTC (rev 
2067)
@@ -57,7 +57,7 @@
        kern/misc.c kern/parser.c kern/partition.c kern/rescue.c        \
        kern/term.c kern/list.c kern/handler.c fs/fshelp.c              \
        kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       lib/arg.c normal/cmdline.c normal/command.c                     \
+       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
@@ -126,7 +126,7 @@
 # Please put arch dependant part of normal.mod at the end of list to
 # keep it simpler to update to different architectures.
 #
-normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
+normal_mod_SOURCES = normal/cmdline.c normal/command.c normal/datetime.c \
        normal/completion.c normal/execute.c                            \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \

Modified: trunk/grub2/conf/sparc64-ieee1275.mk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.mk        2009-04-05 15:34:30 UTC (rev 
2066)
+++ trunk/grub2/conf/sparc64-ieee1275.mk        2009-04-05 20:19:05 UTC (rev 
2067)
@@ -57,7 +57,7 @@
 #      kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c     \
 #      kern/parser.c kern/partition.c kern/rescue.c kern/term.c        \
 #      kern/list.c kern/handler.c                                      \
-#      normal/arg.c normal/cmdline.c normal/command.c                  \
+#      normal/arg.c normal/cmdline.c normal/command.c normal/datetime.c \
 #      normal/completion.c normal/context.c normal/execute.c           \
 #      normal/function.c normal/lexer.c                                \
 #      normal/main.c normal/menu.c normal/menu_entry.c                 \
@@ -793,7 +793,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c    \
-       normal/completion.c normal/execute.c                            \
+       normal/datetime.c normal/completion.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -801,12 +801,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/sparc64/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_sparc64_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d 
normal_mod-normal_command.d normal_mod-normal_completion.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_sparc64_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d 
normal_mod-normal_command.d normal_mod-normal_datetime.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_sparc64_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -815,9 +815,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_sparc64_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o
        -rm -f $@
-       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_sparc64_setjmp.o
+       $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_datetime.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o
 
 mod-normal.o: mod-normal.c
        $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) 
-c -o $@ $<
@@ -891,6 +891,25 @@
        set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
+normal_mod-normal_datetime.o: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES)
+       $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_datetime.d
+
+CLEANFILES += cmd-normal_mod-normal_datetime.lst 
fs-normal_mod-normal_datetime.lst partmap-normal_mod-normal_datetime.lst
+COMMANDFILES += cmd-normal_mod-normal_datetime.lst
+FSFILES += fs-normal_mod-normal_datetime.lst
+PARTMAPFILES += partmap-normal_mod-normal_datetime.lst
+
+cmd-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_datetime.lst: normal/datetime.c 
$(normal/datetime.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
 normal_mod-normal_completion.o: normal/completion.c 
$(normal/completion.c_DEPENDENCIES)
        $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
 -include normal_mod-normal_completion.d

Modified: trunk/grub2/conf/sparc64-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.rmk       2009-04-05 15:34:30 UTC (rev 
2066)
+++ trunk/grub2/conf/sparc64-ieee1275.rmk       2009-04-05 20:19:05 UTC (rev 
2067)
@@ -56,7 +56,7 @@
 #      kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c     \
 #      kern/parser.c kern/partition.c kern/rescue.c kern/term.c        \
 #      kern/list.c kern/handler.c                                      \
-#      normal/arg.c normal/cmdline.c normal/command.c                  \
+#      normal/arg.c normal/cmdline.c normal/command.c normal/datetime.c \
 #      normal/completion.c normal/context.c normal/execute.c           \
 #      normal/function.c normal/lexer.c                                \
 #      normal/main.c normal/menu.c normal/menu_entry.c                 \
@@ -166,7 +166,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c    \
-       normal/completion.c normal/execute.c                            \
+       normal/datetime.c normal/completion.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \

Modified: trunk/grub2/conf/x86_64-efi.mk
===================================================================
--- trunk/grub2/conf/x86_64-efi.mk      2009-04-05 15:34:30 UTC (rev 2066)
+++ trunk/grub2/conf/x86_64-efi.mk      2009-04-05 20:19:05 UTC (rev 2067)
@@ -74,7 +74,8 @@
        kern/loader.c kern/main.c kern/misc.c kern/parser.c             \
        grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
        lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
-       normal/completion.c normal/context.c normal/main.c              \
+       normal/completion.c normal/datetime.c normal/context.c          \
+       normal/main.c           \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c                                              \
        normal/misc.c normal/script.c                                   \
@@ -827,7 +828,7 @@
 # keep it simpler to update to different architectures.
 #
 normal_mod_SOURCES = normal/cmdline.c normal/command.c                 \
-       normal/completion.c normal/execute.c                            \
+       normal/completion.c normal/datetime.c normal/execute.c          \
        normal/function.c normal/lexer.c normal/main.c normal/menu.c    \
        normal/menu_text.c                                              \
        normal/color.c                                                  \
@@ -835,12 +836,12 @@
        normal/misc.c grub_script.tab.c                                 \
        normal/script.c                                                 \
        normal/x86_64/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_x86_64_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o 
normal_mod-normal_cmdline.o normal_mod-normal_command.o 
normal_mod-normal_completion.o normal_mod-normal_datetime.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_x86_64_setjmp.o und-normal.lst
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
 endif
-MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_execute.d 
normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d 
normal_mod-normal_menu.d normal_mod-normal_menu_text.d 
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d 
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d 
normal_mod-grub_script_tab.d normal_mod-normal_script.d 
normal_mod-normal_x86_64_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_cmdline.d normal_mod-normal_command.d 
normal_mod-normal_completion.d normal_mod-normal_datetime.d 
normal_mod-normal_execute.d normal_mod-normal_function.d 
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d 
normal_mod-normal_menu_text.d normal_mod-normal_color.d 
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d 
normal_mod-normal_misc.d normal_mod-grub_script_tab.d 
normal_mod-normal_script.d normal_mod-normal_x86_64_setjmp.d
 UNDSYMFILES += und-normal.lst
 
 normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -849,9 +850,9 @@
        if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
        $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
 
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_execute.o normal_mod-normal_function.o 
normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o 
normal_mod-normal_menu_text.o normal_mod-normal_color.o 
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o 
normal_mod-normal_misc.o normal_mod-grub_script_tab.o 
normal_mod-normal_script.o normal_mod-normal_x86_64_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_cmdline.o 
normal_mod-normal_command.o normal_mod-normal_completion.o 
normal_mod-normal_datetime.o normal_mod-normal_execute.o 
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o 
normal_mod-normal_menu.o normal_mod-normal_menu_text.o 
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o 
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o 
normal_mod-grub_script_tab.o normal_mod-normal_script.o 
normal_mod-normal_x86_64_setjmp.o
        -rm -f $@

@@ Diff output truncated at 153600 characters. @@




reply via email to

[Prev in Thread] Current Thread [Next in Thread]