From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Nov 2009 10:15:24 +0000 (+0100)
Subject: merged mainline into PCI
X-Git-Tag: 1.98~319^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5acc2aba7853c32ea37e26591f9db373554e816d;p=thirdparty%2Fgrub.git

merged mainline into PCI
---

5acc2aba7853c32ea37e26591f9db373554e816d
diff --cc Makefile.in
index 1733f1c01,d9f107bef..5654a89f7
--- a/Makefile.in
+++ b/Makefile.in
@@@ -100,9 -107,8 +107,9 @@@ endi
  AWK = @AWK@
  LIBCURSES = @LIBCURSES@
  LIBUSB = @LIBUSB@
 +LIBPCIACCESS = @LIBPCIACCESS@
  YACC = @YACC@
- UNIFONT_BDF = @UNIFONT_BDF@
+ FONT_SOURCE = @FONT_SOURCE@
  
  # Options.
  enable_grub_emu = @enable_grub_emu@
diff --cc conf/i386-pc.rmk
index e4b89a8b9,e1688ccd5..d343c8be8
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -165,30 -166,24 +166,29 @@@ grub_emu_LDFLAGS = $(LIBCURSES
  ifeq ($(enable_grub_emu_usb), yes)
  grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c	\
  		commands/usbtest.c
 -grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
 +grub_emu_LDFLAGS += $(LIBUSB)
 +endif
 +
 +ifeq ($(enable_grub_emu_pci), yes)
 +grub_emu_SOURCES += util/pci.c commands/lspci.c
 +grub_emu_LDFLAGS += $(LIBPCIACCESS)
  endif
  
- # Scripts.
- sbin_SCRIPTS = grub-install
- bin_SCRIPTS = grub-mkrescue
+ sbin_SCRIPTS += grub-install
+ grub_install_SOURCES = util/grub-install.in
  
- # For grub-install.
- grub_install_SOURCES = util/i386/pc/grub-install.in
+ bin_SCRIPTS += grub-mkrescue
+ grub_mkrescue_SOURCES = util/grub-mkrescue.in
  
- # For grub-mkrescue.
- grub_mkrescue_SOURCES = util/i386/pc/grub-mkrescue.in
+ bin_SCRIPTS += grub-mkfloppy
+ grub_mkfloppy_SOURCES = util/i386/pc/grub-mkfloppy.in
  
- pkglib_MODULES = biosdisk.mod chain.mod \
- 	multiboot.mod reboot.mod halt.mod	\
- 	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod	\
- 	ata.mod vga.mod memdisk.mod pci.mod lspci.mod	\
- 	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \
- 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod \
+ pkglib_MODULES = biosdisk.mod chain.mod 				\
+ 	multiboot.mod reboot.mod halt.mod				\
+ 	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
+ 	vga.mod memdisk.mod pci.mod lspci.mod				\
+ 	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
+ 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
  	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
  	efiemu.mod mmap.mod acpi.mod drivemap.mod