* Support for including *.mk files
@ 2005-11-13 21:06 Timothy Baldwin
2005-11-13 21:16 ` Marco Gerards
0 siblings, 1 reply; 10+ messages in thread
From: Timothy Baldwin @ 2005-11-13 21:06 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1: Type: text/plain, Size: 3291 bytes --]
Since having to edit 4 rmk files every time a system independent change is made
is a bit silly, here is a patch to allow the common rules to be split off to
a shared file. I will submit a patch to do so later.
Also I add ".DELETE_ON_ERROR:" to make make delete targets if there is an
error building them.
2005-11-13 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Support including *.mk files. Fix filename collisions.
Better cleanup on build errors.
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-split1/Makefile.in grub2-split2/Makefile.in
--- grub2-split1/Makefile.in 2005-08-08 20:41:00.000000000 +0100
+++ grub2-split2/Makefile.in 2005-10-22 20:25:44.000000000 +0100
@@ -100,6 +100,18 @@ include $(srcdir)/conf/$(host_cpu)-$(hos
### General targets.
+CLEANFILES += moddep.lst command.lst fs.lst
+pkgdata_DATA += moddep.lst command.lst fs.lst
+moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
+ cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
+ || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+ cat $^ /dev/null | sort > $@
+
+fs.lst: $(FSFILES)
+ cat $^ /dev/null | sort > $@
+
all-local: $(PROGRAMS) $(DATA) $(SCRIPTS) $(MKFILES)
install: install-local
@@ -241,3 +253,5 @@ config.status: configure
# Prevent an overflow.
.NOEXPORT:
+
+.DELETE_ON_ERROR:
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-split1/genmk.rb grub2-split2/genmk.rb
--- grub2-split1/genmk.rb 2005-10-15 08:44:39.000000000 +0100
+++ grub2-split2/genmk.rb 2005-10-22 20:25:44.000000000 +0100
@@ -141,8 +141,8 @@ UNDSYMFILES += #{undsym}
" + objs.collect_with_index do |obj, i|
src = sources[i]
fake_obj = File.basename(src).suffix('o')
- command = 'cmd-' + fake_obj.suffix('lst')
- fs = 'fs-' + fake_obj.suffix('lst')
+ command = 'cmd-' + obj.suffix('lst')
+ fs = 'fs-' + obj.suffix('lst')
dep = deps[i]
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
dir = File.dirname(src)
@@ -314,7 +314,7 @@ while l = gets
unless cont
s.gsub!(/\\\n/, ' ')
- if /^([a-zA-Z0-9_]+)\s*=\s*(.*?)\s*$/ =~ s
+ if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
var, args = $1, $2
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
@@ -367,14 +367,3 @@ while l = gets
end
-puts "CLEANFILES += moddep.lst command.lst fs.lst"
-puts "pkgdata_DATA += moddep.lst command.lst fs.lst"
-puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
-puts " cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
-puts " || (rm -f $@; exit 1)"
-puts ""
-puts "command.lst: $(COMMANDFILES)"
-puts " cat $^ /dev/null | sort > $@"
-puts ""
-puts "fs.lst: $(FSFILES)"
-puts " cat $^ /dev/null | sort > $@"
--
Member AFFS, WYLUG, SWP (UK), UAF, RESPECT, StWC
No to software patents! Victory to the iraqi resistance!
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-13 21:06 Support for including *.mk files Timothy Baldwin
@ 2005-11-13 21:16 ` Marco Gerards
2005-11-15 22:13 ` Timothy Baldwin
0 siblings, 1 reply; 10+ messages in thread
From: Marco Gerards @ 2005-11-13 21:16 UTC (permalink / raw)
To: The development of GRUB 2
Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> Since having to edit 4 rmk files every time a system independent change is made
> is a bit silly, here is a patch to allow the common rules to be split off to
> a shared file. I will submit a patch to do so later.
>
> Also I add ".DELETE_ON_ERROR:" to make make delete targets if there is an
> error building them.
Damn, we were talking about adding such feature today on IRC. It's
nice to see that you did more than talking. :-)
It's just that I know very little about the build system, so I wait a
bit so people can comment on your patch. It would be nice if you can
send in the patch that actually splits up the rmk files so I can see
why you made some changes in this patch.
Thanks,
Marco
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-13 21:16 ` Marco Gerards
@ 2005-11-15 22:13 ` Timothy Baldwin
2005-11-16 6:49 ` Marco Gerards
0 siblings, 1 reply; 10+ messages in thread
From: Timothy Baldwin @ 2005-11-15 22:13 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1.1: Type: text/plain, Size: 408 bytes --]
On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
> It would be nice if you can
> send in the patch that actually splits up the rmk files so I can see
> why you made some changes in this patch.
Here it is, and I have included the previous patch, as the tabs got changed to
spaces.
--
Member AFFS, WYLUG, SWP (UK), UAF, RESPECT, StWC
No to software patents! Victory to the iraqi resistance!
[-- Attachment #1.2: genmk1.diff --]
[-- Type: text/x-diff, Size: 2856 bytes --]
2005-11-13 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Support including *.mk files, fix filename collisons. Better
cleanup on build errors.
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-split1/Makefile.in grub2-split2/Makefile.in
--- grub2-split1/Makefile.in 2005-08-08 20:41:00.000000000 +0100
+++ grub2-split2/Makefile.in 2005-10-22 20:25:44.000000000 +0100
@@ -100,6 +100,18 @@ include $(srcdir)/conf/$(host_cpu)-$(hos
### General targets.
+CLEANFILES += moddep.lst command.lst fs.lst
+pkgdata_DATA += moddep.lst command.lst fs.lst
+moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
+ cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
+ || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+ cat $^ /dev/null | sort > $@
+
+fs.lst: $(FSFILES)
+ cat $^ /dev/null | sort > $@
+
all-local: $(PROGRAMS) $(DATA) $(SCRIPTS) $(MKFILES)
install: install-local
@@ -241,3 +253,5 @@ config.status: configure
# Prevent an overflow.
.NOEXPORT:
+
+.DELETE_ON_ERROR:
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-split1/genmk.rb grub2-split2/genmk.rb
--- grub2-split1/genmk.rb 2005-10-15 08:44:39.000000000 +0100
+++ grub2-split2/genmk.rb 2005-10-22 20:25:44.000000000 +0100
@@ -141,8 +141,8 @@ UNDSYMFILES += #{undsym}
" + objs.collect_with_index do |obj, i|
src = sources[i]
fake_obj = File.basename(src).suffix('o')
- command = 'cmd-' + fake_obj.suffix('lst')
- fs = 'fs-' + fake_obj.suffix('lst')
+ command = 'cmd-' + obj.suffix('lst')
+ fs = 'fs-' + obj.suffix('lst')
dep = deps[i]
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
dir = File.dirname(src)
@@ -314,7 +314,7 @@ while l = gets
unless cont
s.gsub!(/\\\n/, ' ')
- if /^([a-zA-Z0-9_]+)\s*=\s*(.*?)\s*$/ =~ s
+ if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
var, args = $1, $2
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
@@ -367,14 +367,3 @@ while l = gets
end
-puts "CLEANFILES += moddep.lst command.lst fs.lst"
-puts "pkgdata_DATA += moddep.lst command.lst fs.lst"
-puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
-puts " cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
-puts " || (rm -f $@; exit 1)"
-puts ""
-puts "command.lst: $(COMMANDFILES)"
-puts " cat $^ /dev/null | sort > $@"
-puts ""
-puts "fs.lst: $(FSFILES)"
-puts " cat $^ /dev/null | sort > $@"
[-- Attachment #1.3: split.diff --]
[-- Type: text/x-diff, Size: 17468 bytes --]
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/conf/common.rmk grub2-split/conf/common.rmk
--- grub2-genmk/conf/common.rmk 1970-01-01 01:00:00.000000000 +0100
+++ grub2-split/conf/common.rmk 2005-11-15 20:10:15.000000000 +0000
@@ -0,0 +1,240 @@
+# -*- makefile -*-
+
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
+ sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
+ sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
+
+# For the parser.
+grub_script.tab.c: normal/parser.y
+ $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+grub_script.tab.h: normal/parser.y
+ $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+
+
+
+# Utilities.
+sbin_UTILITIES += grub-emu
+
+# For grub-emu.
+grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
+ commands/configfile.c commands/default.c commands/help.c \
+ commands/terminal.c commands/ls.c commands/test.c \
+ commands/search.c commands/timeout.c \
+ commands/i386/pc/halt.c commands/i386/pc/reboot.c \
+ disk/loopback.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 \
+ 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/context.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 \
+ util/console.c util/grub-emu.c util/misc.c \
+ util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
+ util/i386/pc/misc.c grub_emu_init.c
+
+grub_emu_LDFLAGS = $(LIBCURSES)
+
+grub_modules_init.lst: geninit.sh
+ (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
+
+grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
+ sh $(srcdir)/geninitheader.sh > $@
+
+grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
+ sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
+
+
+
+# Filing systems.
+pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
+ minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod \
+ sfs.mod
+
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fat.mod.
+fat_mod_SOURCES = fs/fat.c
+fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ufs.mod.
+ufs_mod_SOURCES = fs/ufs.c
+ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ext2.mod.
+ext2_mod_SOURCES = fs/ext2.c
+ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For minix.mod.
+minix_mod_SOURCES = fs/minix.c
+minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hfs.mod.
+hfs_mod_SOURCES = fs/hfs.c
+hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iso9660.mod.
+iso9660_mod_SOURCES = fs/iso9660.c
+iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For xfs.mod.
+xfs_mod_SOURCES = fs/xfs.c
+xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For affs.mod.
+affs_mod_SOURCES = fs/affs.c
+affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sfs.mod.
+sfs_mod_SOURCES = fs/sfs.c
+sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Partiton maps.
+pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod
+
+# For amiga.mod
+amiga_mod_SOURCES = partmap/amiga.c
+amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For apple.mod
+apple_mod_SOURCES = partmap/apple.c
+apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pc.mod
+pc_mod_SOURCES = partmap/pc.c
+pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acorn.mod
+acorn_mod_SOURCES = partmap/acorn.c
+acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Commands.
+pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod \
+ cmp.mod cat.mod help.mod font.mod search.mod \
+ loopback.mod default.mod timeout.mod configfile.mod \
+ terminfo.mod
+
+# For hello.mod.
+hello_mod_SOURCES = hello/hello.c
+hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+boot_mod_SOURCES = commands/boot.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminal.mod.
+terminal_mod_SOURCES = commands/terminal.c
+terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ls.mod.
+ls_mod_SOURCES = commands/ls.c
+ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cmp.mod.
+cmp_mod_SOURCES = commands/cmp.c
+cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cat.mod.
+cat_mod_SOURCES = commands/cat.c
+cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For help.mod.
+help_mod_SOURCES = commands/help.c
+help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For font.mod.
+font_mod_SOURCES = font/manager.c
+font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For search.mod.
+search_mod_SOURCES = commands/search.c
+search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For test.mod.
+test_mod_SOURCES = commands/test.c
+test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loopback.mod
+loopback_mod_SOURCES = disk/loopback.c
+loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For default.mod
+default_mod_SOURCES = commands/default.c
+default_mod_CFLAGS = $(COMMON_CFLAGS)
+default_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For timeout.mod
+timeout_mod_SOURCES = commands/timeout.c
+timeout_mod_CFLAGS = $(COMMON_CFLAGS)
+timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For configfile.mod
+configfile_mod_SOURCES = commands/configfile.c
+configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminfo.mod.
+terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
+terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Misc.
+pkgdata_MODULES += gzio.mod
+
+# For gzio.mod.
+gzio_mod_SOURCES = io/gzio.c
+gzio_mod_CFLAGS = $(COMMON_CFLAGS)
+gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/conf/i386-pc.rmk grub2-split/conf/i386-pc.rmk
--- grub2-genmk/conf/i386-pc.rmk 2005-11-13 21:04:24.000000000 +0000
+++ grub2-split/conf/i386-pc.rmk 2005-11-15 19:28:44.000000000 +0000
@@ -40,22 +40,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8200 $(COMMON_CFLAGS)
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
- sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
-
-# For the parser.
-grub_script.tab.c: normal/parser.y
- $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
- $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
- sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
-
# Utilities.
bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-setup grub-emu grub-mkdevicemap grub-probefs
@@ -84,39 +68,6 @@ grub_probefs_SOURCES = util/i386/pc/grub
fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c kern/env.c fs/fshelp.c \
fs/xfs.c fs/affs.c fs/sfs.c
-# For grub-emu.
-grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
- commands/configfile.c commands/default.c commands/help.c \
- commands/terminal.c commands/ls.c commands/test.c \
- commands/search.c commands/timeout.c \
- commands/i386/pc/halt.c commands/i386/pc/reboot.c \
- disk/loopback.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 \
- 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/context.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 \
- util/console.c util/grub-emu.c util/misc.c \
- util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
- util/i386/pc/misc.c grub_emu_init.c
-
-grub_emu_LDFLAGS = $(LIBCURSES)
-
-grub_modules_init.lst: geninit.sh
- (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
-
-grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
- sh $(srcdir)/geninitheader.sh > $@
-
-grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
- sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
# For genmoddep.
genmoddep_SOURCES = util/genmoddep.c
@@ -128,15 +79,9 @@ sbin_SCRIPTS = grub-install
grub_install_SOURCES = util/i386/pc/grub-install.in
# Modules.
-pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
- ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod \
- font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod \
- terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
- apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
- help.mod default.mod timeout.mod configfile.mod vbe.mod \
- vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod \
- terminfo.mod serial.mod xfs.mod affs.mod sfs.mod test.mod \
- acorn.mod
+pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod \
+ _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \
+ vbe.mod vesafb.mod vbetest.mod vbeinfo.mod
# For _chain.mod.
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -148,61 +93,6 @@ chain_mod_SOURCES = loader/i386/pc/chain
chain_mod_CFLAGS = $(COMMON_CFLAGS)
chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs.mod.
-ufs_mod_SOURCES = fs/ufs.c
-ufs_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For _linux.mod.
_linux_mod_SOURCES = loader/i386/pc/linux.c
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -223,41 +113,6 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminal.mod.
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For reboot.mod.
reboot_mod_SOURCES = commands/i386/pc/reboot.c
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -273,16 +128,6 @@ vga_mod_SOURCES = term/i386/pc/vga.c
vga_mod_CFLAGS = $(COMMON_CFLAGS)
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For font.mod.
-font_mod_SOURCES = font/manager.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For serial.mod.
serial_mod_SOURCES = term/i386/pc/serial.c
serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -298,51 +143,6 @@ multiboot_mod_SOURCES = loader/i386/pc/m
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For default.mod
-default_mod_SOURCES = commands/default.c
-default_mod_CFLAGS = $(COMMON_CFLAGS)
-default_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For timeout.mod
-timeout_mod_SOURCES = commands/timeout.c
-timeout_mod_CFLAGS = $(COMMON_CFLAGS)
-timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For vbe.mod.
vbe_mod_SOURCES = video/i386/pc/vbe.c
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -363,17 +163,4 @@ vbetest_mod_SOURCES = commands/i386/pc/v
vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For search.mod.
-search_mod_SOURCES = commands/search.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+include $(srcdir)/conf/common.mk
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/Makefile.in grub2-split/Makefile.in
--- grub2-genmk/Makefile.in 2005-11-15 20:07:31.000000000 +0000
+++ grub2-split/Makefile.in 2005-11-15 20:08:42.000000000 +0000
@@ -71,7 +71,7 @@ LIBLZO = @LIBLZO@
### General variables.
-RMKFILES = $(addprefix conf/,i386-pc.rmk powerpc-ieee1275.rmk)
+RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk)
MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-15 22:13 ` Timothy Baldwin
@ 2005-11-16 6:49 ` Marco Gerards
2005-11-17 19:25 ` Timothy Baldwin
0 siblings, 1 reply; 10+ messages in thread
From: Marco Gerards @ 2005-11-16 6:49 UTC (permalink / raw)
To: The development of GRUB 2
Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
>
>> It would be nice if you can
>> send in the patch that actually splits up the rmk files so I can see
>> why you made some changes in this patch.
>
> Here it is, and I have included the previous patch, as the tabs got changed to
> spaces.
Nice! Can you include the changelog entry for the second patch?
Thanks,
Marco
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-16 6:49 ` Marco Gerards
@ 2005-11-17 19:25 ` Timothy Baldwin
2005-11-17 19:30 ` Marco Gerards
2005-11-18 13:47 ` Marco Gerards
0 siblings, 2 replies; 10+ messages in thread
From: Timothy Baldwin @ 2005-11-17 19:25 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1.1: Type: text/plain, Size: 5370 bytes --]
On Wednesday 16 Nov 2005 06:49, Marco Gerards wrote:
> Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> > On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
> >> It would be nice if you can
> >> send in the patch that actually splits up the rmk files so I can see
> >> why you made some changes in this patch.
> >
> > Here it is, and I have included the previous patch, as the tabs got
> > changed to spaces.
>
> Nice! Can you include the changelog entry for the second patch?
Here it is, with revised patch as I split out to much.
2005-11-17 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* Makefile.in (RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/common.rmk: New file.
* conf/i386-pc.rmk: include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod, hello.mod,
boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod, help.mod, font.mod,
terminfo.mod, amiga.mod, apple.mod, pc.mod, sun.mod, acorn.mod,
loopback.mod, default.mod, timeout.mod, configfile.mod, search.mod,
gzio.mod and test.mod.
(symlist.c): Moved rule to common.rmk.
(grub_script.tab.c): Likewise.
(grub_script.tab.h): Likewise.
(kernel_syms.lst): Likewise.
(grub_modules_init.lst): Likewise.
(grub_modules_init.h): Likewise.
(grub_emu_init.c): Likewise.
(fshelp_mod_SOURCES): Moved variable to common.rmk.
(fshelp_mod_CFLAGS): Likewise.
(fshelp_mod_LDFLAGS): Likewise.
(fat_mod_SOURCES): Likewise.
(fat_mod_CFLAGS): Likewise.
(fat_mod_LDFLAGS): Likewise.
(ext2_mod_SOURCES): Likewise.
(ext2_mod_CFLAGS): Likewise.
(ext2_mod_LDFLAGS): Likewise.
(ufs_mod_SOURCES): Likewise.
(ufs_mod_CFLAGS): Likewise.
(ufs_mod_LDFLAGS): Likewise.
(minix_mod_SOURCES): Likewise.
(minix_mod_CFLAGS): Likewise.
(minix_mod_LDFLAGS): Likewise.
(hfs_mod_SOURCES): Likewise.
(hfs_mod_CFLAGS): Likewise.
(hfs_mod_LDFLAGS): Likewise.
(jfs_mod_SOURCES): Likewise.
(jfs_mod_CFLAGS): Likewise.
(jfs_mod_LDFLAGS): Likewise.
(iso9660_mod_SOURCES): Likewise.
(iso9660_mod_CFLAGS): Likewise.
(iso9660_mod_LDFLAGS): Likewise.
(xfs_mod_SOURCES): Likewise.
(xfs_mod_CFLAGS): Likewise.
(xfs_mod_LDFLAGS): Likewise.
(affs_mod_SOURCES): Likewise.
(affs_mod_CFLAGS): Likewise.
(affs_mod_LDFLAGS): Likewise.
(sfs_mod_SOURCES): Likewise.
(sfs_mod_CFLAGS): Likewise.
(sfs_mod_LDFLAGS): Likewise.
(hello_mod_SOURCES): Likewise.
(hello_mod_CFLAGS): Likewise.
(hello_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Likewise.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
(terminal_mod_SOURCES): Likewise.
(terminal_mod_CFLAGS): Likewise.
(terminal_mod_LDFLAGS): Likewise.
(ls_mod_SOURCES): Likewise.
(ls_mod_CFLAGS): Likewise.
(ls_mod_LDFLAGS): Likewise.
(cmp_mod_SOURCES): Likewise.
(cmp_mod_CFLAGS): Likewise.
(cmp_mod_LDFLAGS): Likewise.
(cat_mod_SOURCES): Likewise.
(cat_mod_CFLAGS): Likewise.
(cat_mod_LDFLAGS): Likewise.
(help_mod_SOURCES): Likewise.
(help_mod_CFLAGS): Likewise.
(help_mod_LDFLAGS): Likewise.
(font_mod_SOURCES): Likewise.
(font_mod_CFLAGS): Likewise.
(font_mod_LDFLAGS): Likewise.
(terminfo_mod_SOURCES): Likewise.
(terminfo_mod_CFLAGS): Likewise.
(terminfo_mod_LDFLAGS): Likewise.
(amiga_mod_SOURCES): Likewise.
(amiga_mod_CFLAGS): Likewise.
(amiga_mod_LDFLAGS): Likewise.
(apple_mod_SOURCES): Likewise.
(apple_mod_CFLAGS): Likewise.
(apple_mod_LDFLAGS): Likewise.
(pc_mod_SOURCES): Likewise.
(pc_mod_CFLAGS): Likewise.
(pc_mod_LDFLAGS): Likewise.
(sun_mod_SOURCES): Likewise.
(sun_mod_CFLAGS): Likewise.
(sun_mod_LDFLAGS): Likewise.
(acorn_mod_SOURCES): Likewise.
(acorn_mod_CFLAGS): Likewise.
(acorn_mod_LDFLAGS): Likewise.
(loopback_mod_SOURCES): Likewise.
(loopback_mod_CFLAGS): Likewise.
(loopback_mod_LDFLAGS): Likewise.
(default_mod_SOURCES): Likewise.
(default_mod_CFLAGS): Likewise.
(default_mod_LDFLAGS): Likewise.
(timeout_mod_SOURCES): Likewise.
(timeout_mod_CFLAGS): Likewise.
(timeout_mod_LDFLAGS): Likewise.
(configfile_mod_SOURCES): Likewise.
(configfile_mod_CFLAGS): Likewise.
(configfile_mod_LDFLAGS): Likewise.
(search_mod_SOURCES): Likewise.
(search_mod_CFLAGS): Likewise.
(search_mod_LDFLAGS): Likewise.
(gzio_mod_SOURCES): Likewise.
(gzio_mod_CFLAGS): Likewise.
(gzio_mod_LDFLAGS): Likewise.
(test_mod_SOURCES): Likewise.
(test_mod_CFLAGS): Likewise.
(test_mod_LDFLAGS): Likewise.
--
Member AFFS, WYLUG, SWP (UK), UAF, RESPECT, StWC
No to software patents! Victory to the iraqi resistance!
[-- Attachment #1.2: split2.diff --]
[-- Type: text/x-diff, Size: 14304 bytes --]
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/conf/common.rmk grub2-split/conf/common.rmk
--- grub2-genmk/conf/common.rmk 1970-01-01 01:00:00.000000000 +0100
+++ grub2-split/conf/common.rmk 2005-11-17 18:58:41.000000000 +0000
@@ -0,0 +1,201 @@
+# -*- makefile -*-
+
+grub_script.tab.c: normal/parser.y
+ $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+grub_script.tab.h: normal/parser.y
+ $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+
+
+grub_modules_init.lst: geninit.sh
+ (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
+
+grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
+ sh $(srcdir)/geninitheader.sh > $@
+
+grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
+ sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
+
+
+
+# Filing systems.
+pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
+ minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod \
+ sfs.mod
+
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fat.mod.
+fat_mod_SOURCES = fs/fat.c
+fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ufs.mod.
+ufs_mod_SOURCES = fs/ufs.c
+ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ext2.mod.
+ext2_mod_SOURCES = fs/ext2.c
+ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For minix.mod.
+minix_mod_SOURCES = fs/minix.c
+minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hfs.mod.
+hfs_mod_SOURCES = fs/hfs.c
+hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iso9660.mod.
+iso9660_mod_SOURCES = fs/iso9660.c
+iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For xfs.mod.
+xfs_mod_SOURCES = fs/xfs.c
+xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For affs.mod.
+affs_mod_SOURCES = fs/affs.c
+affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sfs.mod.
+sfs_mod_SOURCES = fs/sfs.c
+sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Partiton maps.
+pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod
+
+# For amiga.mod
+amiga_mod_SOURCES = partmap/amiga.c
+amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For apple.mod
+apple_mod_SOURCES = partmap/apple.c
+apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pc.mod
+pc_mod_SOURCES = partmap/pc.c
+pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acorn.mod
+acorn_mod_SOURCES = partmap/acorn.c
+acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Commands.
+pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod \
+ cmp.mod cat.mod help.mod font.mod search.mod \
+ loopback.mod default.mod timeout.mod configfile.mod \
+ terminfo.mod
+
+# For hello.mod.
+hello_mod_SOURCES = hello/hello.c
+hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+boot_mod_SOURCES = commands/boot.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminal.mod.
+terminal_mod_SOURCES = commands/terminal.c
+terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ls.mod.
+ls_mod_SOURCES = commands/ls.c
+ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cmp.mod.
+cmp_mod_SOURCES = commands/cmp.c
+cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cat.mod.
+cat_mod_SOURCES = commands/cat.c
+cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For help.mod.
+help_mod_SOURCES = commands/help.c
+help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For font.mod.
+font_mod_SOURCES = font/manager.c
+font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For search.mod.
+search_mod_SOURCES = commands/search.c
+search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For test.mod.
+test_mod_SOURCES = commands/test.c
+test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loopback.mod
+loopback_mod_SOURCES = disk/loopback.c
+loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For default.mod
+default_mod_SOURCES = commands/default.c
+default_mod_CFLAGS = $(COMMON_CFLAGS)
+default_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For timeout.mod
+timeout_mod_SOURCES = commands/timeout.c
+timeout_mod_CFLAGS = $(COMMON_CFLAGS)
+timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For configfile.mod
+configfile_mod_SOURCES = commands/configfile.c
+configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminfo.mod.
+terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
+terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Misc.
+pkgdata_MODULES += gzio.mod
+
+# For gzio.mod.
+gzio_mod_SOURCES = io/gzio.c
+gzio_mod_CFLAGS = $(COMMON_CFLAGS)
+gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/conf/i386-pc.rmk grub2-split/conf/i386-pc.rmk
--- grub2-genmk/conf/i386-pc.rmk 2005-11-13 21:04:24.000000000 +0000
+++ grub2-split/conf/i386-pc.rmk 2005-11-17 18:28:45.000000000 +0000
@@ -46,13 +46,6 @@ DEFSYMFILES += kernel_syms.lst
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
-# For the parser.
-grub_script.tab.c: normal/parser.y
- $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
- $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-
-
kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
@@ -109,15 +102,6 @@ grub_emu_SOURCES = commands/boot.c comma
grub_emu_LDFLAGS = $(LIBCURSES)
-grub_modules_init.lst: geninit.sh
- (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
-
-grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
- sh $(srcdir)/geninitheader.sh > $@
-
-grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
- sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
-
# For genmoddep.
genmoddep_SOURCES = util/genmoddep.c
@@ -128,15 +112,9 @@ sbin_SCRIPTS = grub-install
grub_install_SOURCES = util/i386/pc/grub-install.in
# Modules.
-pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
- ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod \
- font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod \
- terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
- apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
- help.mod default.mod timeout.mod configfile.mod vbe.mod \
- vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod \
- terminfo.mod serial.mod xfs.mod affs.mod sfs.mod test.mod \
- acorn.mod
+pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod \
+ _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \
+ vbe.mod vesafb.mod vbetest.mod vbeinfo.mod
# For _chain.mod.
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -148,61 +126,6 @@ chain_mod_SOURCES = loader/i386/pc/chain
chain_mod_CFLAGS = $(COMMON_CFLAGS)
chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs.mod.
-ufs_mod_SOURCES = fs/ufs.c
-ufs_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For _linux.mod.
_linux_mod_SOURCES = loader/i386/pc/linux.c
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -223,41 +146,6 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminal.mod.
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For reboot.mod.
reboot_mod_SOURCES = commands/i386/pc/reboot.c
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -273,16 +161,6 @@ vga_mod_SOURCES = term/i386/pc/vga.c
vga_mod_CFLAGS = $(COMMON_CFLAGS)
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For font.mod.
-font_mod_SOURCES = font/manager.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For serial.mod.
serial_mod_SOURCES = term/i386/pc/serial.c
serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -298,51 +176,6 @@ multiboot_mod_SOURCES = loader/i386/pc/m
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For default.mod
-default_mod_SOURCES = commands/default.c
-default_mod_CFLAGS = $(COMMON_CFLAGS)
-default_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For timeout.mod
-timeout_mod_SOURCES = commands/timeout.c
-timeout_mod_CFLAGS = $(COMMON_CFLAGS)
-timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For vbe.mod.
vbe_mod_SOURCES = video/i386/pc/vbe.c
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -363,17 +196,4 @@ vbetest_mod_SOURCES = commands/i386/pc/v
vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For search.mod.
-search_mod_SOURCES = commands/search.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+include $(srcdir)/conf/common.mk
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2-genmk/Makefile.in grub2-split/Makefile.in
--- grub2-genmk/Makefile.in 2005-11-15 20:07:31.000000000 +0000
+++ grub2-split/Makefile.in 2005-11-17 19:12:30.000000000 +0000
@@ -71,7 +71,8 @@ LIBLZO = @LIBLZO@
### General variables.
-RMKFILES = $(addprefix conf/,i386-pc.rmk powerpc-ieee1275.rmk)
+RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
+ sparc64-ieee1275.rmk)
MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-17 19:25 ` Timothy Baldwin
@ 2005-11-17 19:30 ` Marco Gerards
2005-11-18 10:58 ` Yoshinori K. Okuji
2005-11-18 13:47 ` Marco Gerards
1 sibling, 1 reply; 10+ messages in thread
From: Marco Gerards @ 2005-11-17 19:30 UTC (permalink / raw)
To: The development of GRUB 2
Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> On Wednesday 16 Nov 2005 06:49, Marco Gerards wrote:
>> Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
>> > On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
>> >> It would be nice if you can
>> >> send in the patch that actually splits up the rmk files so I can see
>> >> why you made some changes in this patch.
>> >
>> > Here it is, and I have included the previous patch, as the tabs got
>> > changed to spaces.
>>
>> Nice! Can you include the changelog entry for the second patch?
>
> Here it is, with revised patch as I split out to much.
Thanks a lot! I will wait for Okuji's comment because this is quite a
big change and he wrote the build system.
--
Marco
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-17 19:30 ` Marco Gerards
@ 2005-11-18 10:58 ` Yoshinori K. Okuji
0 siblings, 0 replies; 10+ messages in thread
From: Yoshinori K. Okuji @ 2005-11-18 10:58 UTC (permalink / raw)
To: The development of GRUB 2
On Thursday 17 November 2005 08:30 pm, Marco Gerards wrote:
> Thanks a lot! I will wait for Okuji's comment because this is quite a
> big change and he wrote the build system.
Good.
Okuji
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-17 19:25 ` Timothy Baldwin
2005-11-17 19:30 ` Marco Gerards
@ 2005-11-18 13:47 ` Marco Gerards
2005-11-18 14:14 ` Timothy Baldwin
1 sibling, 1 reply; 10+ messages in thread
From: Marco Gerards @ 2005-11-18 13:47 UTC (permalink / raw)
To: The development of GRUB 2
Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> On Wednesday 16 Nov 2005 06:49, Marco Gerards wrote:
>> Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
>> > On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
>> >> It would be nice if you can
>> >> send in the patch that actually splits up the rmk files so I can see
>> >> why you made some changes in this patch.
>> >
>> > Here it is, and I have included the previous patch, as the tabs got
>> > changed to spaces.
>>
>> Nice! Can you include the changelog entry for the second patch?
>
> Here it is, with revised patch as I split out to much.
It doesn't compile. I was about to commit it, but I had the following
problem:
ccache gcc-4.0 -Iutil -I./util -I. -Iinclude -I./include -Wall -W -DGRUB_DATADIR=\"/usr/local/share/grub/i386-pc\" -g -O2 -DGRUB_UTIL=1 -c -o genmoddep-util_genmoddep.o util/genmoddep.c
ccache gcc-4.0 -o genmoddep genmoddep-util_genmoddep.o
cat kernel_syms.lst def-_chain.lst def-chain.lst def-_linux.lst def-linux.lst def-normal.lst def-reboot.lst def-halt.lst def-vga.lst def-_multiboot.lst def-multiboot.lst def-vbe.lst def-vesafb.lst def-vbeinfo.lst def-vbetest.lst /dev/null | ./genmoddep und-_chain.lst und-chain.lst und-_linux.lst und-linux.lst und-normal.lst und-reboot.lst und-halt.lst und-vga.lst und-_multiboot.lst und-multiboot.lst und-vbe.lst und-vesafb.lst und-vbeinfo.lst und-vbetest.lst > moddep.lst \
|| (rm -f moddep.lst; exit 1)
genmoddep: error: grub_font_get_glyph in vga is not defined
make: *** [moddep.lst] Error 1
It seems that the -def.lst files are not correctly generated and/or
used. Can you please fix that.
I have changed your ChangeLog a bit. I'm including that so you can
build on that for the next patch.
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* Makefile.in (RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/common.rmk: New file.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c,
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
Thanks,
Marco
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-18 13:47 ` Marco Gerards
@ 2005-11-18 14:14 ` Timothy Baldwin
2005-11-18 14:58 ` Marco Gerards
0 siblings, 1 reply; 10+ messages in thread
From: Timothy Baldwin @ 2005-11-18 14:14 UTC (permalink / raw)
To: The development of GRUB 2
[-- Attachment #1.1: Type: text/plain, Size: 3690 bytes --]
On Friday 18 Nov 2005 13:47, Marco Gerards wrote:
> Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> > On Wednesday 16 Nov 2005 06:49, Marco Gerards wrote:
> >> Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> >> > On Sunday 13 Nov 2005 21:16, Marco Gerards wrote:
> >> >> It would be nice if you can
> >> >> send in the patch that actually splits up the rmk files so I can see
> >> >> why you made some changes in this patch.
> >> >
> >> > Here it is, and I have included the previous patch, as the tabs got
> >> > changed to spaces.
> >>
> >> Nice! Can you include the changelog entry for the second patch?
> >
> > Here it is, with revised patch as I split out to much.
>
> It doesn't compile. I was about to commit it, but I had the following
> problem:
> genmoddep: error: grub_font_get_glyph in vga is not defined
> make: *** [moddep.lst] Error 1
You forgot the first patch (genmk.diff), also Okuji's latest commit conflicts
with it. So here it is all together.
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/common.rmk: New file.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c,
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
--
Member AFFS, WYLUG, SWP (UK), UAF, RESPECT, StWC
No to software patents! Victory to the iraqi resistance!
[-- Attachment #1.2: split3.diff --]
[-- Type: text/x-diff, Size: 16244 bytes --]
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2/conf/common.rmk grub2-split/conf/common.rmk
--- grub2/conf/common.rmk 1970-01-01 01:00:00.000000000 +0100
+++ grub2-split/conf/common.rmk 2005-11-18 13:43:23.000000000 +0000
@@ -0,0 +1,200 @@
+# -*- makefile -*-
+
+# For the parser.
+grub_script.tab.c grub_script.tab.h: normal/parser.y
+ $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+
+# For grub-emu.
+grub_modules_init.lst: geninit.sh
+ (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
+
+grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
+ sh $(srcdir)/geninitheader.sh > $@
+
+grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
+ sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
+
+
+
+# Filing systems.
+pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
+ minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod \
+ sfs.mod
+
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fat.mod.
+fat_mod_SOURCES = fs/fat.c
+fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ufs.mod.
+ufs_mod_SOURCES = fs/ufs.c
+ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ext2.mod.
+ext2_mod_SOURCES = fs/ext2.c
+ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For minix.mod.
+minix_mod_SOURCES = fs/minix.c
+minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hfs.mod.
+hfs_mod_SOURCES = fs/hfs.c
+hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iso9660.mod.
+iso9660_mod_SOURCES = fs/iso9660.c
+iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For xfs.mod.
+xfs_mod_SOURCES = fs/xfs.c
+xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For affs.mod.
+affs_mod_SOURCES = fs/affs.c
+affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sfs.mod.
+sfs_mod_SOURCES = fs/sfs.c
+sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Partiton maps.
+pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod
+
+# For amiga.mod
+amiga_mod_SOURCES = partmap/amiga.c
+amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For apple.mod
+apple_mod_SOURCES = partmap/apple.c
+apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pc.mod
+pc_mod_SOURCES = partmap/pc.c
+pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acorn.mod
+acorn_mod_SOURCES = partmap/acorn.c
+acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Commands.
+pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod \
+ cmp.mod cat.mod help.mod font.mod search.mod \
+ loopback.mod default.mod timeout.mod configfile.mod \
+ terminfo.mod
+
+# For hello.mod.
+hello_mod_SOURCES = hello/hello.c
+hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+boot_mod_SOURCES = commands/boot.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminal.mod.
+terminal_mod_SOURCES = commands/terminal.c
+terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ls.mod.
+ls_mod_SOURCES = commands/ls.c
+ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cmp.mod.
+cmp_mod_SOURCES = commands/cmp.c
+cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cat.mod.
+cat_mod_SOURCES = commands/cat.c
+cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For help.mod.
+help_mod_SOURCES = commands/help.c
+help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For font.mod.
+font_mod_SOURCES = font/manager.c
+font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For search.mod.
+search_mod_SOURCES = commands/search.c
+search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For test.mod.
+test_mod_SOURCES = commands/test.c
+test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loopback.mod
+loopback_mod_SOURCES = disk/loopback.c
+loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For default.mod
+default_mod_SOURCES = commands/default.c
+default_mod_CFLAGS = $(COMMON_CFLAGS)
+default_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For timeout.mod
+timeout_mod_SOURCES = commands/timeout.c
+timeout_mod_CFLAGS = $(COMMON_CFLAGS)
+timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For configfile.mod
+configfile_mod_SOURCES = commands/configfile.c
+configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminfo.mod.
+terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
+terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Misc.
+pkgdata_MODULES += gzio.mod
+
+# For gzio.mod.
+gzio_mod_SOURCES = io/gzio.c
+gzio_mod_CFLAGS = $(COMMON_CFLAGS)
+gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2/conf/i386-pc.rmk grub2-split/conf/i386-pc.rmk
--- grub2/conf/i386-pc.rmk 2005-11-18 13:37:36.000000000 +0000
+++ grub2-split/conf/i386-pc.rmk 2005-11-18 13:43:22.000000000 +0000
@@ -46,11 +46,6 @@ DEFSYMFILES += kernel_syms.lst
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
-# For the parser.
-grub_script.tab.c grub_script.tab.h: normal/parser.y
- $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-
-
kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
@@ -107,15 +102,6 @@ grub_emu_SOURCES = commands/boot.c comma
grub_emu_LDFLAGS = $(LIBCURSES)
-grub_modules_init.lst: geninit.sh
- (cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
-
-grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
- sh $(srcdir)/geninitheader.sh > $@
-
-grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
- sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
-
# For genmoddep.
genmoddep_SOURCES = util/genmoddep.c
@@ -126,15 +112,9 @@ sbin_SCRIPTS = grub-install
grub_install_SOURCES = util/i386/pc/grub-install.in
# Modules.
-pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
- ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod \
- font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod \
- terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
- apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
- help.mod default.mod timeout.mod configfile.mod vbe.mod \
- vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod \
- terminfo.mod serial.mod xfs.mod affs.mod sfs.mod test.mod \
- acorn.mod
+pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod \
+ _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \
+ vbe.mod vesafb.mod vbetest.mod vbeinfo.mod
# For _chain.mod.
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -146,61 +126,6 @@ chain_mod_SOURCES = loader/i386/pc/chain
chain_mod_CFLAGS = $(COMMON_CFLAGS)
chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs.mod.
-ufs_mod_SOURCES = fs/ufs.c
-ufs_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For _linux.mod.
_linux_mod_SOURCES = loader/i386/pc/linux.c
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -221,41 +146,6 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminal.mod.
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For reboot.mod.
reboot_mod_SOURCES = commands/i386/pc/reboot.c
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -271,16 +161,6 @@ vga_mod_SOURCES = term/i386/pc/vga.c
vga_mod_CFLAGS = $(COMMON_CFLAGS)
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For font.mod.
-font_mod_SOURCES = font/manager.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For serial.mod.
serial_mod_SOURCES = term/i386/pc/serial.c
serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -296,51 +176,6 @@ multiboot_mod_SOURCES = loader/i386/pc/m
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For default.mod
-default_mod_SOURCES = commands/default.c
-default_mod_CFLAGS = $(COMMON_CFLAGS)
-default_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For timeout.mod
-timeout_mod_SOURCES = commands/timeout.c
-timeout_mod_CFLAGS = $(COMMON_CFLAGS)
-timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
# For vbe.mod.
vbe_mod_SOURCES = video/i386/pc/vbe.c
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -361,17 +196,4 @@ vbetest_mod_SOURCES = commands/i386/pc/v
vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-# For search.mod.
-search_mod_SOURCES = commands/search.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+include $(srcdir)/conf/common.mk
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2/genmk.rb grub2-split/genmk.rb
--- grub2/genmk.rb 2005-10-01 20:49:55.000000000 +0100
+++ grub2-split/genmk.rb 2005-11-15 18:46:34.000000000 +0000
@@ -141,8 +141,8 @@ UNDSYMFILES += #{undsym}
" + objs.collect_with_index do |obj, i|
src = sources[i]
fake_obj = File.basename(src).suffix('o')
- command = 'cmd-' + fake_obj.suffix('lst')
- fs = 'fs-' + fake_obj.suffix('lst')
+ command = 'cmd-' + obj.suffix('lst')
+ fs = 'fs-' + obj.suffix('lst')
dep = deps[i]
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
dir = File.dirname(src)
@@ -314,7 +314,7 @@ while l = gets
unless cont
s.gsub!(/\\\n/, ' ')
- if /^([a-zA-Z0-9_]+)\s*=\s*(.*?)\s*$/ =~ s
+ if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
var, args = $1, $2
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
@@ -367,14 +367,3 @@ while l = gets
end
-puts "CLEANFILES += moddep.lst command.lst fs.lst"
-puts "pkgdata_DATA += moddep.lst command.lst fs.lst"
-puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
-puts " cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
-puts " || (rm -f $@; exit 1)"
-puts ""
-puts "command.lst: $(COMMANDFILES)"
-puts " cat $^ /dev/null | sort > $@"
-puts ""
-puts "fs.lst: $(FSFILES)"
-puts " cat $^ /dev/null | sort > $@"
diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x '*.orig' -x '*.rej' -x CVS grub2/Makefile.in grub2-split/Makefile.in
--- grub2/Makefile.in 2005-11-15 19:45:59.000000000 +0000
+++ grub2-split/Makefile.in 2005-11-17 19:12:30.000000000 +0000
@@ -71,7 +71,8 @@ LIBLZO = @LIBLZO@
### General variables.
-RMKFILES = $(addprefix conf/,i386-pc.rmk powerpc-ieee1275.rmk)
+RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
+ sparc64-ieee1275.rmk)
MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
@@ -100,6 +101,18 @@ include $(srcdir)/conf/$(host_cpu)-$(hos
### General targets.
+CLEANFILES += moddep.lst command.lst fs.lst
+pkgdata_DATA += moddep.lst command.lst fs.lst
+moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
+ cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
+ || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+ cat $^ /dev/null | sort > $@
+
+fs.lst: $(FSFILES)
+ cat $^ /dev/null | sort > $@
+
all-local: $(PROGRAMS) $(DATA) $(SCRIPTS) $(MKFILES)
install: install-local
@@ -241,3 +254,5 @@ config.status: configure
# Prevent an overflow.
.NOEXPORT:
+
+.DELETE_ON_ERROR:
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Support for including *.mk files
2005-11-18 14:14 ` Timothy Baldwin
@ 2005-11-18 14:58 ` Marco Gerards
0 siblings, 0 replies; 10+ messages in thread
From: Marco Gerards @ 2005-11-18 14:58 UTC (permalink / raw)
To: The development of GRUB 2
Timothy Baldwin <tim.lists@majoroak.f2s.com> writes:
> You forgot the first patch (genmk.diff), also Okuji's latest commit conflicts
> with it. So here it is all together.
Oh, I thought genmk2.diff replaced genmk.diff. :-)
Committed.
Thanks,
Marco
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2005-11-18 14:58 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-13 21:06 Support for including *.mk files Timothy Baldwin
2005-11-13 21:16 ` Marco Gerards
2005-11-15 22:13 ` Timothy Baldwin
2005-11-16 6:49 ` Marco Gerards
2005-11-17 19:25 ` Timothy Baldwin
2005-11-17 19:30 ` Marco Gerards
2005-11-18 10:58 ` Yoshinori K. Okuji
2005-11-18 13:47 ` Marco Gerards
2005-11-18 14:14 ` Timothy Baldwin
2005-11-18 14:58 ` Marco Gerards
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.