From 8b6a8d2ae248eaffd0417a0d56818257270de182 Mon Sep 17 00:00:00 2001 From: jeroen Date: Wed, 8 Nov 2006 23:17:22 +0000 Subject: [PATCH] regenerate i386-pc.mk and i386-efi.mk to get rid of bogus loader/multiboot_normal.c in dependencies --- conf/i386-efi.mk | 3 ++- conf/i386-pc.mk | 55 ++++++++++++++++++------------------------------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/conf/i386-efi.mk b/conf/i386-efi.mk index e29dbc408..f09414760 100644 --- a/conf/i386-efi.mk +++ b/conf/i386-efi.mk @@ -61,7 +61,8 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ fs/affs.c fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c \ fs/jfs.c fs/minix.c fs/sfs.c fs/ufs.c fs/xfs.c fs/hfsplus.c \ io/gzio.c \ - kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ + kern/device.c kern/disk.c kern/dl.c kern/elf.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 \ diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk index bc872a3b4..06d5184e4 100644 --- a/conf/i386-pc.mk +++ b/conf/i386-pc.mk @@ -1360,13 +1360,13 @@ serial_mod_CFLAGS = $(COMMON_CFLAGS) serial_mod_LDFLAGS = $(COMMON_LDFLAGS) # For _multiboot.mod. -_multiboot_mod_SOURCES = loader/multiboot.c loader/i386/pc/multiboot.c -CLEANFILES += _multiboot.mod mod-_multiboot.o mod-_multiboot.c pre-_multiboot.o _multiboot_mod-loader_multiboot.o _multiboot_mod-loader_i386_pc_multiboot.o und-_multiboot.lst +_multiboot_mod_SOURCES = loader/i386/pc/multiboot.c +CLEANFILES += _multiboot.mod mod-_multiboot.o mod-_multiboot.c pre-_multiboot.o _multiboot_mod-loader_i386_pc_multiboot.o und-_multiboot.lst ifneq ($(_multiboot_mod_EXPORTS),no) CLEANFILES += def-_multiboot.lst DEFSYMFILES += def-_multiboot.lst endif -MOSTLYCLEANFILES += _multiboot_mod-loader_multiboot.d _multiboot_mod-loader_i386_pc_multiboot.d +MOSTLYCLEANFILES += _multiboot_mod-loader_i386_pc_multiboot.d UNDSYMFILES += und-_multiboot.lst _multiboot.mod: pre-_multiboot.o mod-_multiboot.o @@ -1374,9 +1374,9 @@ _multiboot.mod: pre-_multiboot.o mod-_multiboot.o $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@ -pre-_multiboot.o: $(_multiboot_mod_DEPENDENCIES) _multiboot_mod-loader_multiboot.o _multiboot_mod-loader_i386_pc_multiboot.o +pre-_multiboot.o: $(_multiboot_mod_DEPENDENCIES) _multiboot_mod-loader_i386_pc_multiboot.o -rm -f $@ - $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _multiboot_mod-loader_multiboot.o _multiboot_mod-loader_i386_pc_multiboot.o + $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _multiboot_mod-loader_i386_pc_multiboot.o mod-_multiboot.o: mod-_multiboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS) -c -o $@ $< @@ -1393,21 +1393,6 @@ und-_multiboot.lst: pre-_multiboot.o echo '_multiboot' > $@ $(NM) -u -P -p $< | cut -f1 -d' ' >> $@ -_multiboot_mod-loader_multiboot.o: loader/multiboot.c - $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS) -MD -c -o $@ $< --include _multiboot_mod-loader_multiboot.d - -CLEANFILES += cmd-_multiboot_mod-loader_multiboot.lst fs-_multiboot_mod-loader_multiboot.lst -COMMANDFILES += cmd-_multiboot_mod-loader_multiboot.lst -FSFILES += fs-_multiboot_mod-loader_multiboot.lst - -cmd-_multiboot_mod-loader_multiboot.lst: loader/multiboot.c gencmdlist.sh - set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh _multiboot > $@ || (rm -f $@; exit 1) - -fs-_multiboot_mod-loader_multiboot.lst: loader/multiboot.c genfslist.sh - set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh _multiboot > $@ || (rm -f $@; exit 1) - - _multiboot_mod-loader_i386_pc_multiboot.o: loader/i386/pc/multiboot.c $(TARGET_CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS) -MD -c -o $@ $< -include _multiboot_mod-loader_i386_pc_multiboot.d @@ -1427,13 +1412,13 @@ _multiboot_mod_CFLAGS = $(COMMON_CFLAGS) _multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) # For multiboot.mod. -multiboot_mod_SOURCES = loader/multiboot_normal.c -CLEANFILES += multiboot.mod mod-multiboot.o mod-multiboot.c pre-multiboot.o multiboot_mod-loader_multiboot_normal.o und-multiboot.lst +multiboot_mod_SOURCES = loader/i386/pc/multiboot_normal.c +CLEANFILES += multiboot.mod mod-multiboot.o mod-multiboot.c pre-multiboot.o multiboot_mod-loader_i386_pc_multiboot_normal.o und-multiboot.lst ifneq ($(multiboot_mod_EXPORTS),no) CLEANFILES += def-multiboot.lst DEFSYMFILES += def-multiboot.lst endif -MOSTLYCLEANFILES += multiboot_mod-loader_multiboot_normal.d +MOSTLYCLEANFILES += multiboot_mod-loader_i386_pc_multiboot_normal.d UNDSYMFILES += und-multiboot.lst multiboot.mod: pre-multiboot.o mod-multiboot.o @@ -1441,9 +1426,9 @@ multiboot.mod: pre-multiboot.o mod-multiboot.o $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@ -pre-multiboot.o: $(multiboot_mod_DEPENDENCIES) multiboot_mod-loader_multiboot_normal.o +pre-multiboot.o: $(multiboot_mod_DEPENDENCIES) multiboot_mod-loader_i386_pc_multiboot_normal.o -rm -f $@ - $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ multiboot_mod-loader_multiboot_normal.o + $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ multiboot_mod-loader_i386_pc_multiboot_normal.o mod-multiboot.o: mod-multiboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -c -o $@ $< @@ -1460,19 +1445,19 @@ und-multiboot.lst: pre-multiboot.o echo 'multiboot' > $@ $(NM) -u -P -p $< | cut -f1 -d' ' >> $@ -multiboot_mod-loader_multiboot_normal.o: loader/multiboot_normal.c - $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -MD -c -o $@ $< --include multiboot_mod-loader_multiboot_normal.d +multiboot_mod-loader_i386_pc_multiboot_normal.o: loader/i386/pc/multiboot_normal.c + $(TARGET_CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -MD -c -o $@ $< +-include multiboot_mod-loader_i386_pc_multiboot_normal.d -CLEANFILES += cmd-multiboot_mod-loader_multiboot_normal.lst fs-multiboot_mod-loader_multiboot_normal.lst -COMMANDFILES += cmd-multiboot_mod-loader_multiboot_normal.lst -FSFILES += fs-multiboot_mod-loader_multiboot_normal.lst +CLEANFILES += cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst +COMMANDFILES += cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst +FSFILES += fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst -cmd-multiboot_mod-loader_multiboot_normal.lst: loader/multiboot_normal.c gencmdlist.sh - set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1) +cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst: loader/i386/pc/multiboot_normal.c gencmdlist.sh + set -e; $(TARGET_CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1) -fs-multiboot_mod-loader_multiboot_normal.lst: loader/multiboot_normal.c genfslist.sh - set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1) +fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst: loader/i386/pc/multiboot_normal.c genfslist.sh + set -e; $(TARGET_CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1) multiboot_mod_CFLAGS = $(COMMON_CFLAGS)