vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge with mainline

Browse source
This commit is contained in:
BVK Chaitanya 2010-09-03 20:06:57 +05:30
commit 0dfb7ba053
176 changed files with 9708 additions and 5141 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Makefile.util.def
View file

@ -88,6 +88,7 @@ library = {
common = grub-core/partmap/gpt.c;
common = grub-core/partmap/msdos.c;
common = grub-core/partmap/sun.c;
common = grub-core/partmap/sunpc.c;
common = grub-core/script/function.c;
common = grub-core/script/lexer.c;
common = grub-core/script/main.c;
@ -99,7 +100,7 @@ program = {
name = grub-bin2h;
common = util/bin2h.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
mansection = 1;
};
@ -112,7 +113,7 @@ program = {
extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
};
@ -123,7 +124,7 @@ program = {
common = util/grub-mkrelpath.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -133,7 +134,7 @@ program = {
common = util/grub-script-check.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -143,7 +144,7 @@ program = {
common = util/grub-editenv.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@ -153,7 +154,7 @@ program = {
common = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
};
@ -171,7 +172,7 @@ program = {
common = util/grub-pe2elf.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL)';
ldadd = '$(LIBINTL)';
condition = COND_GRUB_PE2ELF;
};
@ -181,7 +182,7 @@ program = {
common = util/grub-fstest.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
condition = COND_GRUB_FSTEST;
};
@ -194,8 +195,8 @@ program = {
cflags = '$(freetype_cflags)';
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldflags = '$(freetype_libs)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = '$(freetype_libs)';
condition = COND_GRUB_MKFONT;
};
@ -212,7 +213,7 @@ program = {
sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@ -222,7 +223,7 @@ program = {
common = util/grub-probe.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@ -239,7 +240,7 @@ program = {
sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
enable = i386_pc;
enable = sparc64_ieee1275;
@ -252,6 +253,7 @@ program = {
ieee1275 = util/ieee1275/ofpath.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
enable = sparc64_ieee1275;
};
@ -329,11 +331,12 @@ script = {
script = {
mansection = 1;
name = grub-mkrescue;
x86_noieee1275 = util/grub-mkrescue.in;
x86 = util/grub-mkrescue.in;
powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
enable = i386_pc;
enable = x86_efi;
enable = i386_qemu;
enable = i386_multiboot;
enable = i386_coreboot;
enable = powerpc_ieee1275;
};
@ -344,15 +347,17 @@ script = {
name = grub-install;
mips = util/grub-install.in;
i386_noefi_noieee1275 = util/grub-install.in;
i386_pc = util/grub-install.in;
i386_qemu = util/grub-install.in;
i386_coreboot = util/grub-install.in;
i386_multiboot = util/grub-install.in;
sparc64_ieee1275 = util/grub-install.in;
x86_efi = util/i386/efi/grub-install.in;
i386_ieee1275 = util/ieee1275/grub-install.in;
powerpc_ieee1275 = util/ieee1275/grub-install.in;
enable = x86;
enable = mips;
enable = powerpc_ieee1275;
enable = noemu;
};
script = {
@ -512,5 +517,5 @@ program = {
common = grub-core/tests/lib/test.c;
cflags = -Wno-format;
ldadd = libgrub.a;
ldflags = '$(LIBDEVMAPPER)';
ldadd = '$(LIBDEVMAPPER)';
};