From dacd27130a75d6ced7eb08bd3535752bff424c33 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Fri, 13 Nov 2009 15:48:17 +0000 Subject: [PATCH] 2009-11-13 Robert Millan Remove everything not related to Multiboot. A huge number of files was removed (too many to list them here). The following files were modified: * AUTHORS: Remove GRUB-specific bits. * Makefile.am: Likewise. * THANKS: Likewise. * autogen.sh: Likewise. * configure.ac: Likewise. * docs/Makefile.am: Likewise. --- AUTHORS | 53 +------ ChangeLog | 13 ++ Makefile.am | 3 +- THANKS | 124 ---------------- configure.ac | 375 +---------------------------------------------- docs/Makefile.am | 32 +--- 6 files changed, 27 insertions(+), 573 deletions(-) delete mode 100644 THANKS diff --git a/AUTHORS b/AUTHORS index ea8cb4a1b..14f1245e1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,54 +1,13 @@ -VaX#n8 (real name unknown) wrote shared_src/fsys_ext2fs.c. -Heiko Schroeder rewrote shared_src/stage1.S to be more readable. +Bryan Ford and Erich Stefan Boleyn wrote the initial version of the Multiboot +specification. The following authors assigned copyright on their work to the Free Software Foundation: -Erich Stefan Boleyn originally designed and implemented GRUB. +In year 1999, Kunihiro Ishiguro provided the first version that would be +imported into GNU GRUB. -Gordon Matzigkeit adopted GRUB into the GNU Project. He fixed several -bugs, added symbolic link support to shared_src/fsys_ext2fs.c, and -began the implementation of /sbin/grub. He was an official maintainer. +Yoshinori K. Okuji maintained it during the 1999-2006 period. -Yoshinori K. Okuji contributed many bugfixes and new features, such as -working LBA support, /sbin/grub support for configuration files, the -script /sbin/grub-install, the utility /bin/mbchk, the new engine for -builtin commands, disk swapping support, keyboard configuration support, -network support, online help support, command-line history support, -hidden menu support, the new Linux loader, serial terminal support, -single-line editing support, the utility /sbin/grub-md5-crypt, the new -GRUB manual, and several new commands. He is the current official -maintainer. - -Peter Astrand added support for a color menu. - -Pavel Roskin contributed many bugfixes and new features, such as FreeBSD -support for the grub shell, and configure process cleanups. - -Klaus Reichl wrote stage2/fsys_minix.c. - -Per Lundberg added graphics support to the Multiboot Specification. - -Jochen Hoenicke rewrote stage2/fsys_fat.c and wrote -stage2/fsys_reiserfs.c and stage2/md5.c. - -Christoph Plattner added support for Net Boot Image Proposal. - -Frank Mehnert added support for hercules console. - -Kristoffer Branemyr added VSTa filesystem support. - -Serguei Tzukanov added JFS and XFS support. - -Jason Thomas added Linux DAC960 support and support for hiding/unhiding -logical partitions, and did a significant bugfix for the terminal stuff. - -Tilmann Bubeck added support for vt100-incompatible terminals. - -KB Sriram added a better detection of FAT filesystem and fixed a -network device completion. - -Eric Kvaalen fixed a lot of problems in the GRUB manual. - -Leonid Lisovskiy added El Torito support. +In year 2000, Per Lundberg added graphics support. diff --git a/ChangeLog b/ChangeLog index 2fc978ba6..9e9ea4858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-11-13 Robert Millan + + Remove everything not related to Multiboot. A huge number of files + was removed (too many to list them here). The following files were + modified: + + * AUTHORS: Remove GRUB-specific bits. + * Makefile.am: Likewise. + * THANKS: Likewise. + * autogen.sh: Likewise. + * configure.ac: Likewise. + * docs/Makefile.am: Likewise. + 2009-07-02 Pavel Roskin * docs/boot.S: Fix missing newline at the end. diff --git a/Makefile.am b/Makefile.am index 63a9a4f60..fcaf291e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ # Do not change this order if you don't know what you are doing. AUTOMAKE_OPTIONS = 1.7 gnu -SUBDIRS = netboot stage2 stage1 lib grub util docs -EXTRA_DIST = BUGS MAINTENANCE +SUBDIRS = docs diff --git a/THANKS b/THANKS deleted file mode 100644 index 97a5eb584..000000000 --- a/THANKS +++ /dev/null @@ -1,124 +0,0 @@ -GRUB would not be what it is today without the invaluable help of -everybody who was kind enough to spend time testing it and reporting -bugs. - -The following people made especially gracious contributions of their -time and energy in helping to track down bugs, add new features, and -generally assist in the GRUB maintainership process: - -Adam Lackorzynski -Adrian Phillips -Alban Crequy -Alessandro Rubini -Alexander K. Hudek -Alexander Langer -Alfred M. Szmidt -Andrew Clausen -Andrew Walrond -Ben Liblit -Bernhard Treutwein -Bodo Rueskamp . -Boji Tony Kannanthanam -Bradford Hovinen -Brian Brunswick -Bryan Ford -Cedric Ware -Chip Salzenberg -Christian Jones -Christoph Plattner -Damian Ivereigh -David Weinehall -Dan J. Walters -Daniel Farrell -Daniel Pittman -Daniel Wagner -Danilo Godec -Dennis Kitzman -Derrik Pates -Edmund GRIMLEY EVANS -Eduard Guzovsky -Edward Killips -Egmont Koblinger -Eric Hanchrow -Erik Schoenfelder -Eugene Doudine -Florian Hatat -Frank Mehnert -Gary Poppitz -Goran Koruga -Hal Snyder -HASEGAWA Tomoki -Heikki Vatiainen -Heiko Schroeder -Henrik Nordstrom -Herbert Nachtnebel -Hidetoshi Nishimaki -Hisazumi Kenji -HORIKAWA Kazunori -Ilguiz Latypov -Jan Fricke -Jan Zerebecki -Jason Thomas -Jean-Jacques Michel -Jeremy Katz -Jochen Hoenicke -Johannes Kroeger -John Goerzen -John Tobey -Josip Rodin -Julien Bordet -Julien Perrot -Kalle Olavi Niemitalo -Karsten Scheibler -KB Sriram -Khimenko Victor -Klaus Reichl -Kristoffer Branemyr -Kunihiro Ishiguro -Leendert Meyer -Leonid Lisovskiy -M. Meiarashi -Mark Kettenis -Mark Lundeberg -Matt Perry -Matt Yourst -Matthias Granberry -Matthias Kretschmer -Michael Hohmuth -Michael Sullivan -Mike Meyer -Miles Bader -NATORI Shin -Neal H Walfield -Neelkanth Natu -OKUJI Yoshinori -Pavel Roskin -Per Lundberg -Peter Astrand -Ralf Medow -Ramon van Handel -Robert Millan -Roderich Schupp -Rogelio M. Serrano Jr. -Sergey Matveychuk -Serguei Tzukanov -Stefan Ondrejicka -Stephen Early -Steven Dick -Sven Wegener -Takehiro Suzuki -Taketo Kabe -Thierry DELHAISE -Thierry Laronde -Thomas Schweikle -Thomas Schwinge -Tilmann Bubeck -Timothy Baldwin -Torsten Duwe -Uwe Dannowski -VaX#n8 -Vesa Jaaskelainen -Yedidyah Bar-David -Yury V. Umanets -Yuri Zaporogets -Vitaly Fertman diff --git a/configure.ac b/configure.ac index 2c6e5c95e..94dc37733 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Configure script for GRUB. -dnl Copyright 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc. +dnl Copyright 1999,2000,2001,2002,2003,2004,2005,2008,2009 Free Software Foundation, Inc. dnl Permission to use, copy, modify and distribute this software and its dnl documentation is hereby granted, provided that both the copyright @@ -13,42 +13,12 @@ dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE dnl USE OF THIS SOFTWARE. AC_PREREQ(2.57) -AC_INIT([GRUB], [0.97], [bug-grub@gnu.org]) -AC_CONFIG_SRCDIR([stage2/stage2.c]) +AC_INIT([Multiboot], [0.6.95], [bug-grub@gnu.org]) +AC_CONFIG_SRCDIR([docs/multiboot.texi]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE -AC_CANONICAL_HOST - -case "$host_cpu" in -i[[3456]]86) host_cpu=i386 ;; -x86_64) host_cpu=x86_64 ;; -*) AC_MSG_ERROR([unsupported CPU type]) ;; -esac - -AC_SUBST(host_cpu) -AC_SUBST(host_vendor) - -# -# Options -# - -AM_MAINTAINER_MODE -if test "x$enable_maintainer_mode" = xyes; then - AC_PATH_PROG(PERL,perl) - if test -z "$PERL"; then - AC_MSG_ERROR([perl not found]) - fi -fi - -# This should be checked before AC_PROG_CC -if test "x$CFLAGS" = x; then - default_CFLAGS=yes -fi - -if test "x$host_cpu" = xx86_64; then - CFLAGS="-m32 $CFLAGS" -fi +CFLAGS="-m32 $CFLAGS" # # Programs @@ -56,6 +26,7 @@ fi AC_CHECK_TOOL(CC, gcc) AC_PROG_CC +AM_PROG_AS # We need this for older versions of Autoconf. _AM_DEPENDENCIES(CC) @@ -331,351 +302,17 @@ if test "x$enable_packet_retransmission" != xno; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1" fi -AC_ARG_ENABLE(pci-direct, - [ --enable-pci-direct access PCI directly instead of using BIOS]) -if test "x$enable_pci_direct" = xyes; then - NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONFIG_PCI_DIRECT=1" -fi - -dnl Device drivers. -AC_ARG_ENABLE(3c509, - [ --enable-3c509 enable 3Com509 driver]) -if test "x$enable_3c509" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o" -fi - -AC_ARG_ENABLE(3c529, - [ --enable-3c529 enable 3Com529 driver]) -if test "x$enable_3c529" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o" -fi - -AC_ARG_ENABLE(3c595, - [ --enable-3c595 enable 3Com595 driver]) -if test "x$enable_3c595" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C595=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c595.o" -fi - -AC_ARG_ENABLE(3c90x, - [ --enable-3c90x enable 3Com90x driver]) -if test "x$enable_3c90x" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C90X=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o" -fi - -AC_ARG_ENABLE(cs89x0, - [ --enable-cs89x0 enable CS89x0 driver]) -if test "x$enable_cs89x0" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o" -fi - -AC_ARG_ENABLE(davicom, - [ --enable-davicom enable Davicom driver]) -if test "x$enable_davicom" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DAVICOM=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o" -fi - -AC_ARG_ENABLE(depca, - [ --enable-depca enable DEPCA and EtherWORKS driver]) -if test "x$enable_depca" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o" -fi - -AC_ARG_ENABLE(eepro, - [ --enable-eepro enable Etherexpress Pro/10 driver]) -if test "x$enable_eepro" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o" -fi - -AC_ARG_ENABLE(eepro100, - [ --enable-eepro100 enable Etherexpress Pro/100 driver]) -if test "x$enable_eepro100" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO100=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro100.o" -fi - -AC_ARG_ENABLE(epic100, - [ --enable-epic100 enable SMC 83c170 EPIC/100 driver]) -if test "x$enable_epic100" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EPIC100=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o" -fi - -AC_ARG_ENABLE(3c507, - [ --enable-3c507 enable 3Com507 driver]) -if test "x$enable_3c507" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o" -fi - -AC_ARG_ENABLE(exos205, - [ --enable-exos205 enable EXOS205 driver]) -if test "x$enable_exos205" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o" -fi - -AC_ARG_ENABLE(ni5210, - [ --enable-ni5210 enable Racal-Interlan NI5210 driver]) -if test "x$enable_ni5210" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o" -fi - -AC_ARG_ENABLE(lance, - [ --enable-lance enable Lance PCI PCNet/32 driver]) -if test "x$enable_lance" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o" -fi - -AC_ARG_ENABLE(ne2100, - [ --enable-ne2100 enable Novell NE2100 driver]) -if test "x$enable_ne2100" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o" -fi - -AC_ARG_ENABLE(ni6510, - [ --enable-ni6510 enable Racal-Interlan NI6510 driver]) -if test "x$enable_ni6510" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o" -fi - -AC_ARG_ENABLE(natsemi, - [ --enable-natsemi enable NatSemi DP8381x driver]) -if test "x$enable_natsemi" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NATSEMI=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o" -fi - -AC_ARG_ENABLE(ni5010, - [ --enable-ni5010 enable Racal-Interlan NI5010 driver]) -if test "x$enable_ni5010" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o" -fi - -AC_ARG_ENABLE(3c503, - [ --enable-3c503 enable 3Com503 driver]) -if test "x$enable_3c503" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o" -fi - -AC_ARG_ENABLE(ne, - [ --enable-ne enable NE1000/2000 ISA driver]) -if test "x$enable_ne" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o" -fi - -AC_ARG_ENABLE(ns8390, - [ --enable-ns8390 enable NE2000 PCI driver]) -if test "x$enable_ns8390" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS8390=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o" -fi - -AC_ARG_ENABLE(wd, - [ --enable-wd enable WD8003/8013, SMC8216/8416 driver]) -if test "x$enable_wd" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o" -fi - -AC_ARG_ENABLE(otulip, - [ --enable-otulip enable old Tulip driver]) -if test "x$enable_otulip" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o" -fi - -AC_ARG_ENABLE(rtl8139, - [ --enable-rtl8139 enable Realtek 8139 driver]) -if test "x$enable_rtl8139" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_RTL8139=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o" -fi - -AC_ARG_ENABLE(sis900, - [ --enable-sis900 enable SIS 900 and SIS 7016 driver]) -if test "x$enable_sis900" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SIS900=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o" -fi - -AC_ARG_ENABLE(sk-g16, - [ --enable-sk-g16 enable Schneider and Koch G16 driver]) -if test "x$enable_sk_g16" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o" -fi - -AC_ARG_ENABLE(smc9000, - [ --enable-smc9000 enable SMC9000 driver]) -if test "x$enable_smc9000" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o" -fi - -AC_ARG_ENABLE(tiara, - [ --enable-tiara enable Tiara driver]) -if test "x$enable_tiara" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o" -fi - -AC_ARG_ENABLE(tulip, - [ --enable-tulip enable Tulip driver]) -if test "x$enable_tulip" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TULIP=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o" -fi - -AC_ARG_ENABLE(via-rhine, - [ --enable-via-rhine enable Rhine-I/II driver]) -if test "x$enable_via_rhine" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_VIA_RHINE=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS via_rhine.o" -fi - -AC_ARG_ENABLE(w89c840, - [ --enable-w89c840 enable Winbond W89c840, Compex RL100-ATX driver]) -if test "x$enable_w89c840" = xyes; then - NET_CFLAGS="$NET_CFLAGS -DINCLUDE_W89C840=1" - NETBOOT_DRIVERS="$NETBOOT_DRIVERS w89c840.o" -fi - -dnl Check if the netboot support is turned on. -AM_CONDITIONAL(NETBOOT_SUPPORT, test "x$NET_CFLAGS" != x) -if test "x$NET_CFLAGS" != x; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1" -fi - -dnl Extra options. -AC_ARG_ENABLE(3c503-shmem, - [ --enable-3c503-shmem use 3c503 shared memory mode]) -if test "x$enable_3c503_shmem" = xyes; then - NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1" -fi - -AC_ARG_ENABLE(3c503-aui, - [ --enable-3c503-aui use AUI by default on 3c503 cards]) -if test "x$enable_3c503_aui" = xyes; then - NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1" -fi - -AC_ARG_ENABLE(compex-rl2000-fix, - [ --enable-compex-rl2000-fix - specify this if you have a Compex RL2000 PCI]) -if test "x$enable_compex_rl2000_fix" = xyes; then - NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1" -fi - -AC_ARG_ENABLE(smc9000-scan, - [ --enable-smc9000-scan=LIST - probe for SMC9000 I/O addresses using LIST], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"]) - -AC_ARG_ENABLE(ne-scan, - [ --enable-ne-scan=LIST probe for NE base address using LIST], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=$enable_ne_scan"], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=0x280,0x300,0x320,0x340"]) - -AC_ARG_ENABLE(wd-default-mem, - [ --enable-wd-default-mem=MEM - set the default memory location for WD/SMC], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=$enable_wd_default_mem"], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"]) - -AC_ARG_ENABLE(cs-scan, - [ --enable-cs-scan=LIST probe for CS89x0 base address using LIST], - [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"]) - -dnl Diskless -AC_ARG_ENABLE(diskless, - [ --enable-diskless enable diskless support]) -AM_CONDITIONAL(DISKLESS_SUPPORT, test "x$enable_diskless" = xyes) - -dnl Hercules terminal -AC_ARG_ENABLE(hercules, - [ --disable-hercules disable hercules terminal support]) -AM_CONDITIONAL(HERCULES_SUPPORT, test "x$enable_hercules" != xno) - -dnl Serial terminal -AC_ARG_ENABLE(serial, - [ --disable-serial disable serial terminal support]) -AM_CONDITIONAL(SERIAL_SUPPORT, test "x$enable_serial" != xno) - -dnl Simulation of the slowness of a serial device. -AC_ARG_ENABLE(serial-speed-simulation, - [ --enable-serial-speed-simulation - simulate the slowness of a serial device]) -AM_CONDITIONAL(SERIAL_SPEED_SIMULATION, - test "x$enable_serial_speed_simulation" = xyes) - -# Sanity check. -if test "x$enable_diskless" = xyes; then - if test "x$NET_CFLAGS" = x; then - AC_MSG_ERROR([You must enable at least one network driver]) - fi -fi - -dnl Embed a menu string in GRUB itself. -AC_ARG_ENABLE(preset-menu, - [ --enable-preset-menu=FILE - preset a menu file FILE in Stage 2]) -if test "x$enable_preset_menu" = x; then - : -else - if test -r $enable_preset_menu; then - grub_DEFINE_FILE(PRESET_MENU_STRING, [$enable_preset_menu], - [Define if there is user specified preset menu string]) - else - AC_MSG_ERROR([Cannot read the preset menu file $enable_preset_menu]) - fi -fi - dnl Build the example Multiboot kernel. AC_ARG_ENABLE(example-kernel, [ --enable-example-kernel build the example Multiboot kernel]) AM_CONDITIONAL(BUILD_EXAMPLE_KERNEL, test "x$enable_example_kernel" = xyes) -dnl Automatic Linux mem= option. -AC_ARG_ENABLE(auto-linux-mem-opt, - [ --disable-auto-linux-mem-opt - don't pass Linux mem= option automatically]) -if test "x$enable_auto_linux_mem_opt" = xno; then - : -else - AC_DEFINE(AUTO_LINUX_MEM_OPT, 1, [Define if you don't want to pass the mem= option to Linux]) -fi - -dnl Now substitute the variables. -AC_SUBST(FSYS_CFLAGS) -AC_SUBST(NET_CFLAGS) -AC_SUBST(NET_EXTRAFLAGS) -AC_SUBST(NETBOOT_DRIVERS) - dnl Because recent automake complains about CCASFLAGS, set it here. CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)' AC_SUBST(CCASFLAGS) dnl Output. -AC_CONFIG_FILES([Makefile stage1/Makefile stage2/Makefile \ - docs/Makefile lib/Makefile util/Makefile \ - grub/Makefile netboot/Makefile util/grub-image \ - util/grub-install util/grub-md5-crypt \ - util/grub-terminfo util/grub-set-default]) +AC_CONFIG_FILES([Makefile docs/Makefile]) AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am index c658cf5bc..ffe967b60 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,8 +1,6 @@ -info_TEXINFOS = grub.texi multiboot.texi -grub_TEXINFOS = internals.texi fdl.texi +info_TEXINFOS = multiboot.texi EXAMPLES = boot.S kernel.c multiboot.h multiboot_TEXINFOS = boot.S.texi kernel.c.texi multiboot.h.texi -man_MANS = grub.8 mbchk.1 grub-install.8 grub-md5-crypt.8 grub-terminfo.8 HELP2MAN = help2man SRC2TEXI = src2texi noinst_SCRIPTS = $(HELP2MAN) $(SRC2TEXI) @@ -35,31 +33,3 @@ CLEANFILES = $(noinst_PROGRAMS) %.S.texi: %.S $(srcdir)/$(SRC2TEXI) $(SHELL) $(srcdir)/$(SRC2TEXI) $(srcdir) $< $@ - -if MAINTAINER_MODE -$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) - $(PERL) $(srcdir)/$(HELP2MAN) --name="the grub shell" \ - --section=8 --output=$@ $< - -$(srcdir)/grub-install.8: ../util/grub-install $(srcdir)/$(HELP2MAN) - chmod 755 $< - $(PERL) $(srcdir)/$(HELP2MAN) --name="install GRUB on your drive" \ - --section=8 --output=$@ $< - -$(srcdir)/mbchk.1: ../util/mbchk $(srcdir)/$(HELP2MAN) - $(PERL) $(srcdir)/$(HELP2MAN) \ - --name="check the format of a Multiboot kernel" \ - --section=1 --output=$@ $< - -$(srcdir)/grub-md5-crypt.8: ../util/grub-md5-crypt $(srcdir)/$(HELP2MAN) - chmod 755 $< - $(PERL) $(srcdir)/$(HELP2MAN) \ - --name="Encrypt a password in MD5 format" \ - --section=8 --output=$@ $< - -$(srcdir)/grub-terminfo.8: ../util/grub-terminfo $(srcdir)/$(HELP2MAN) - chmod 755 $< - $(PERL) $(srcdir)/$(HELP2MAN) \ - --name="Generate a terminfo command from a terminfo name" \ - --section=8 --output=$@ $< -endif