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

* grub-core/Makefile.core.def: Eliminate rarely used emu_condition. This

Browse source 
in perspective decreases the complexity of build system and fixes
	compilation right now.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-05 11:53:36 +02:00
parent ce79cc99d5
commit fe942b7dbb
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
grub-core/Makefile.core.def
View file

@ -400,11 +400,15 @@ module = {
module = { module = {
name = usb; name = usb;
common = bus/usb/usb.c; common = bus/usb/usb.c;
noemu = bus/usb/usbtrans.c; common = bus/usb/usbtrans.c;
noemu = bus/usb/usbhub.c; common = bus/usb/usbhub.c;
enable = emu;
enable = usb; enable = usb;
emu_condition = COND_GRUB_EMU_USB; };
module = {
name = emuusb;
common = bus/usb/usb.c;
condition = COND_GRUB_EMU_USB;
}; };
module = { module = {
@ -439,18 +443,22 @@ module = {
module = { module = {
name = pci; name = pci;
noemu = bus/pci.c; common = bus/pci.c;
emu = bus/emu/pci.c;
emu = commands/lspci.c;
enable = emu;
enable = i386_pc; enable = i386_pc;
enable = i386_efi; enable = i386_efi;
enable = x86_64_efi; enable = x86_64_efi;
enable = i386_ieee1275; enable = i386_ieee1275;
enable = i386_coreboot; enable = i386_coreboot;
enable = i386_multiboot; enable = i386_multiboot;
emu_condition = COND_GRUB_EMU_PCI; };
module = {
name = emupci;
common = bus/emu/pci.c;
common = commands/lspci.c;
condition = COND_GRUB_EMU_PCI;
}; };
module = { module = {
@ -788,8 +796,6 @@ module = {
name = usbtest; name = usbtest;
common = commands/usbtest.c; common = commands/usbtest.c;
enable = usb; enable = usb;
enable = emu;
emu_condition = COND_GRUB_EMU_USB;
}; };
module = { module = {
@ -903,8 +909,6 @@ module = {
name = usbms; name = usbms;
common = disk/usbms.c; common = disk/usbms.c;
enable = usb; enable = usb;
enable = emu;
emu_condition = COND_GRUB_EMU_USB;
}; };
module = { module = {
@ -1446,9 +1450,7 @@ module = {
common = term/serial.c; common = term/serial.c;
x86 = term/ns8250.c; x86 = term/ns8250.c;
enable = emu;
enable = x86; enable = x86;
emu_condition = COND_GRUB_EMU_USB;
}; };
module = { module = {