merge cleanbuild into emu-modload

diff --cc conf/any-emu.rmk
index 48d1035b308c1a65b296605678b05bdb6353e52f,ee5ab3cd45e01dca3e09d4adc4b046788b863a74..e6e1357e6ac2978c023eab0002e20889aafae629
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -16,40 -17,14 +16,28 @@@ kernel_img_SOURCES = kern/device.c kern
        kern/rescue_reader.c kern/rescue_parser.c                       \
        \
        util/console.c  util/grub-emu.c util/misc.c                     \
-       util/hostdisk.c util/getroot.c util/mm.c                        \
 -      util/hostdisk.c util/getroot.c util/time.c                      \
++      util/hostdisk.c util/getroot.c util/mm.c util/time.c            \
        \
 -      grub_emu_init.c gnulib/progname.c util/hostfs.c disk/host.c
 -kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 +      gnulib/progname.c util/hostfs.c disk/host.c
 +kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 +      env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 +      partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 +      list.h handler.h command.h i18n.h env_private.h
 +kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -Wno-undef
  kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
  TARGET_NO_STRIP = yes
 -TARGET_NO_DYNAMIC_MODULES = yes
 +
 +ifneq ($(TARGET_NO_MODULES), yes)
 +kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
 +ifneq ($(target_cpu), i386)
 +ifneq ($(target_cpu), x86_64)
 +kernel_img_SOURCES += kern/$(target_cpu)/cache.S
 +endif
 +endif
 +else
 +kernel_img_SOURCES += grub_emu_init.c
 +endif
  
- # For boot.mod.
- pkglib_MODULES += boot.mod
- boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
- boot_mod_CFLAGS = $(COMMON_CFLAGS)
- boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 
- # For reboot.mod.
- pkglib_MODULES += reboot.mod
- reboot_mod_SOURCES = commands/reboot.c
- reboot_mod_CFLAGS = $(COMMON_CFLAGS)
- reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 
  # For halt.mod.
  pkglib_MODULES += halt.mod
  halt_mod_SOURCES = commands/halt.c

diff --cc conf/common.rmk
index a775126437f9a47ac67229ef09ae5867172a2612,f3c85d9710ab8069544608568efa3549e5ba8076..c7954d0d8eab4b1cf5746d6d44116165e4f70969
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -759,8 -759,44 +759,44 @@@ password_pbkdf2_mod_SOURCES = commands/
  password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
  password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
+ # For memdisk.mod.
+ pkglib_MODULES += memdisk.mod
+ memdisk_mod_SOURCES = disk/memdisk.c
+ memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
+ memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For reboot.mod.
+ pkglib_MODULES += reboot.mod
+ reboot_mod_SOURCES = commands/reboot.c
+ reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+ reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For date.mod
+ pkglib_MODULES += date.mod
+ date_mod_SOURCES = commands/date.c
+ date_mod_CFLAGS = $(COMMON_CFLAGS)
+ date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For datehook.mod
+ pkglib_MODULES += datehook.mod
+ datehook_mod_SOURCES = hook/datehook.c
+ datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+ datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For lsmmap.mod
+ pkglib_MODULES += lsmmap.mod
+ lsmmap_mod_SOURCES = commands/lsmmap.c
+ lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
+ lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For boot.mod.
+ pkglib_MODULES += boot.mod
+ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
+ boot_mod_CFLAGS = $(COMMON_CFLAGS)
+ boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
  bin_UTILITIES += grub-mkpasswd-pbkdf2
 -grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 +grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
  grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
  
  include $(srcdir)/conf/gcry.mk

diff --cc conf/i386-pc.rmk
index 580bfea0a0ac2a478da282e4472ba45afbc1e410,b30863812fc1adbb98130e8e87102077a9cebd07..9b01d6027d110a6087d6544d5c6ec2faa39d80f9
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -107,7 -107,7 +107,7 @@@ grub_setup_SOURCES = gnulib/progname.c 
        partmap/msdos.c partmap/gpt.c                           \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c                                  \
 -      util/raid.c util/lvm.c                  \
++      util/raid.c util/lvm.c util/mm.c                        \
        grub_setup_init.c
  
  sbin_SCRIPTS += grub-install

diff --cc conf/sparc64-ieee1275.rmk
index befc7dce57738f7e112b48b525e7f578e4b46a6d,69ed325b2aae90d1a2a63af1c17fa6b8b6c418c8..d057c53d62405b09480732c548fd7f6db11b450b
--- 1/conf/sparc64-ieee1275.rmk
--- 2/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@@ -82,7 -82,7 +82,7 @@@ grub_setup_SOURCES = util/sparc64/ieee1
        partmap/sun.c partmap/acorn.c                           \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c gnulib/progname.c                \
 -      util/raid.c util/lvm.c gnulib/progname.c        \
++      util/raid.c util/lvm.c util/mm.c gnulib/progname.c      \
        grub_setup_init.c
  
  # For grub-ofpathname.