COMMON_ASFLAGS = -nostdinc -fno-builtin
COMMON_CFLAGS = -fno-builtin -fpic -minline-int-divide-max-throughput
-COMMON_LDFLAGS = -melf_64 -nostdlib
+COMMON_LDFLAGS = -melf_64 -nostdlib
-STRIP_FLAGS=-R .note -R .comment -X
+STRIP_FLAGS = -R .note -R .comment -X
-# Utilities.
-bin_UTILITIES = grub-elf2pe
-#sbin_UTILITIES = grub-emu
+# Used by various components. These rules need to precede them.
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/ia64/efi/grub-install.in
-
-pkgdata_DATA += kern/ia64/efi/elf_ia64_efi.lds
-
-# For grub-elf2pe
+bin_UTILITIES += grub-elf2pe
grub_elf2pe_SOURCES = util/ia64/efi/elf2pe.c
grub_elf2pe_CFLAGS = -DELF2PE_IA64
-# For grub-emu.
-grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
- commands/configfile.c commands/help.c \
- commands/terminal.c commands/ls.c commands/test.c \
- commands/search.c commands/blocklist.c \
- disk/loopback.c \
- \
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
- fs/hfsplus.c fs/iso9660.c fs/jfs.c fs/minix.c \
- fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
- \
- io/gzio.c \
- kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
- 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 \
- normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
- normal/completion.c normal/main.c \
- normal/menu.c normal/menu_entry.c normal/misc.c normal/script.c \
- partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
- partmap/acorn.c partmap/gpt.c \
- util/console.c util/grub-emu.c util/misc.c \
- util/i386/pc/misc.c grub_emu_init.c
+sbin_SCRIPTS += grub-install
+grub_install_SOURCES = util/ia64/efi/grub-install.in
-grub_emu_LDFLAGS = $(LIBCURSES)
+pkgdata_DATA += kern/ia64/efi/elf_ia64_efi.lds
-# Modules.
-pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod \
- _linux.mod linux.mod memmap.mod systab.mod
+pkglib_MODULES = kernel.img
-# For kernel.mod.
-kernel_mod_EXPORTS = no
-kernel_mod_SOURCES = kern/ia64/efi/startup.S \
- kern/ia64/trampoline.S \
+kernel_img_EXPORTS = no
+kernel_img_SOURCES = kern/ia64/efi/startup.S kern/ia64/trampoline.S \
kern/main.c kern/device.c \
- kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
- kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
- kern/i386/dl.c kern/ia64/efi/init.c kern/parser.c kern/partition.c \
+ kern/disk.c kern/file.c kern/fs.c kern/err.c \
+ kern/misc.c kern/mm.c kern/term.c \
+ kern/rescue_parser.c kern/rescue_reader.c \
+ kern/ia64/efi/init.c kern/parser.c kern/partition.c \
kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
- term/efi/console.c disk/efi/efidisk.c
-kernel_mod_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
- file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h partition.h \
- pc_partition.h rescue.h symbol.h term.h types.h cache.h \
- i386/efi/time.h efi/efi.h efi/time.h efi/disk.h ia64/efi/misc.h
-kernel_mod_CFLAGS = $(COMMON_CFLAGS)
-kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ term/efi/console.c disk/efi/efidisk.c \
+ kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+ kern/generic/rtc_get_time_ms.c \
+ kern/generic/millisleep.c \
+ commands/boot.c \
+ loader/ia64/efi/linux.c \
+ commands/halt.c \
+ commands/reboot.c \
+ commands/efi/memmap.c \
+ commands/efi/systab.c \
+ commands/efi/acpi2.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 \
+ cache.h ia64/efi/misc.h \
+ efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
MOSTLYCLEANFILES += symlist.c
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
DEFSYMFILES += kernel_syms.lst
-symlist.c: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_mod_HEADERS)) config.h genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-# For normal.mod.
-normal_mod_DEPENDENCIES = grub_script.tab.c grub_script.tab.h
-normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
- normal/completion.c normal/execute.c \
- normal/function.c normal/lexer.c normal/main.c normal/menu.c \
- normal/menu_entry.c normal/misc.c grub_script.tab.c \
- normal/script.c \
- normal/ia64/setjmp.S normal/ia64/longjmp.S normal/color.c
-
-normal_mod_CFLAGS = $(COMMON_CFLAGS)
-normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
-normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For _chain.mod.
-_chain_mod_SOURCES = loader/efi/chainloader.c
-_chain_mod_CFLAGS = $(COMMON_CFLAGS)
-_chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader_normal.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For _linux.mod.
-_linux_mod_SOURCES = loader/ia64/efi/linux.c
-_linux_mod_CFLAGS = $(COMMON_CFLAGS)
-_linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/ia64/efi/linux_normal.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memmap.mod.
-memmap_mod_SOURCES = commands/efi/memmap.c
-memmap_mod_CFLAGS = $(COMMON_CFLAGS)
-memmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For systab.mod.
-systab_mod_SOURCES = commands/efi/systab.c commands/efi/acpi.c
-systab_mod_CFLAGS = $(COMMON_CFLAGS)
-systab_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
include $(srcdir)/conf/common.mk