Commit graph

103 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
927d0134c7 SDL 2009-11-20 10:28:42 +01:00
Felix Zielcke
393c783d02 2009-11-19 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (install-local): Add a missing backslash.
2009-11-19 10:07:35 +01:00
Robert Millan
f577f7a09d 2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-setup.c: Include `<grub/i18n.h>'.
        Include `"progname.h"'.
        (main): Initialize gettext.
        * util/i386/pc/grub-setup.c: Gettexttize.
        * util/i386/pc/grub-mkimage.c: Likewise.

        * Makefile.in (po/*.po): Redefine as ...
        ($(foreach lang, $(LINGUAS), po/$(lang).po)): ... this.

        * po/POTFILES: Add `util/i386/pc/grub-setup.c'.
2009-11-18 23:20:22 +00:00
Robert Millan
633877cbb1 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* po/POTFILES-shell: New file.  List `util/grub.d/10_kfreebsd.in'
        and `util/grub.d/10_linux.in'. 
        * Makefile.in (po/$(PACKAGE).pot): Process `po/POTFILES-shell' for
        translatable Shell files.
2009-11-18 21:03:09 +00:00
Robert Millan
af1c0c85a7 2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in ($(srcdir)/aclocal.m4): New target.
2009-11-18 20:57:57 +00:00
Robert Millan
37fb845ba6 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* INSTALL: Document Automake is needed for bootstrap.
        * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
        * util/grub.d/10_kfreebsd.in (bindir): New variable.
        Add gettext initialization.
        (kfreebsd_entry): Make menuentry output translatable.
2009-11-17 11:44:43 +00:00
Robert Millan
8c37c91f99 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables.
        (po/$(PACKAGE).pot): Replace `xgettext' with `$(XGETTEXT)'.
        (po/*.po): Replace `msgmerge' with `$(MSGMERGE)'.
        (po/%.mo): Replace `msgfmt' with `$(MSGFMT)'.
        * po/LINGUAS: New file.
2009-11-17 11:20:39 +00:00
Robert Millan
336262f829 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
        other things).
        * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
        * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
        bindtextdomain() calls for gettext initialization.
2009-11-17 10:47:22 +00:00
Robert Millan
ab502ec59d * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
from here ...
        * Makefile.in (CPPFLAGS): ... to here.
2009-11-17 10:31:08 +00:00
Robert Millan
f5e9dadb58 Use PACKAGE instead of hardcoding "grub". 2009-11-16 20:03:14 +00:00
Robert Millan
49a38e7696 sed Makefile.in -e "s/messages.pot/\$(PACKAGE).pot/g" -i 2009-11-16 19:36:12 +00:00
Robert Millan
ed101e8122 Initial support for gettext in build system. 2009-11-15 23:11:01 +00:00
Felix Zielcke
16a88c491c 2009-11-15 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (TARGET_CPPFLAGS): Replace `-isystem=$(srcdir)/include'
	with `-nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)'.
2009-11-15 13:41:25 +01:00
fzielcke
5b1538672e 2009-11-01 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (TARGET_CPPFLAGS): Add `-I$(srcdir)/include'.
2009-11-01 18:19:04 +00:00
robertmh
d9e2cd701b 2009-10-30 Robert Millan <rmh.grub@aybabtu.com>
Fix build problem.

        * Makefile.in (TARGET_CPPFLAGS): Replace `-nostdinc' with
        `-isystem=$(srcdir)/include'.
2009-10-30 22:51:52 +00:00
robertmh
cee15086c3 2009-10-28 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (TARGET_CPPFLAGS): Add `-nostdinc'.
2009-10-28 23:16:32 +00:00
robertmh
cefabfe1c4 2009-10-26 Robert Millan <rmh.grub@aybabtu.com>
* autogen.sh: Support addition of external modules via `GRUB_CONTRIB'
        variable.
        * Makefile.in: Likewise.
2009-10-26 20:04:43 +00:00
robertmh
0579b753d6 2009-10-26 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (RMKFILES): Rewrite using $(wildcard).
2009-10-26 18:25:02 +00:00
robertmh
5947ae32f5 2009-10-26 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (docs/grub.info): Use make syntax to ignore errors
        in $(MAKEINFO) invocation.  This makes it clear in output that
        errors are being ignored.
2009-10-26 18:02:30 +00:00
cjwatson
186e7cf23b 2009-10-06 Colin Watson <cjwatson@ubuntu.com>
* Makefile.in (docs/stamp-vti): Depend on configure.ac as well, so
	that version.texi is rebuilt on version number changes.
2009-10-06 00:04:32 +00:00
cjwatson
83b65c4afb 2009-10-06 Colin Watson <cjwatson@ubuntu.com>
* Makefile.in: Don't set info_INFOS unless makeinfo was found.
	Fixes bug #27602.
2009-10-05 23:55:48 +00:00
robertmh
0e51c3a7d4 2009-09-28 Robert Millan <rmh.grub@aybabtu.com>
Do not automatically install headers.

        * Makefile.in (include_DATA): Remove.  Update all users.
2009-09-28 14:24:43 +00:00
cjwatson
ff42022396 2009-09-23 Colin Watson <cjwatson@ubuntu.com>
* configure.ac: Call AC_PROG_MKDIR_P.
	* Makefile.in (docs/stamp-vti): Create docs directory.  Create
	version.texi in $(builddir) rather than $(srcdir).
	(docs/grub.info): Create docs directory.  Prepend $(builddir)/docs
	to makeinfo's @include search path.
2009-09-23 17:18:06 +00:00
cjwatson
c44c90db27 2009-09-21 Colin Watson <cjwatson@ubuntu.com>
Build info documentation.  Some code borrowed from Automake.

	* configure.ac: Check for makeinfo.
	* Makefile.in (MAKEINFO, INFOS, info_INFOS): New variables.
	(MAINTAINER_CLEANFILES): Add $(INFOS), docs/stamp-vti, and
	docs/version.texi.
	(MOSTLYCLEANFILES): Add vti.tmp.
	(docs/version.texi, docs/stamp-vti): Update automatically.
	(docs/grub.info): Build info documentation.  Use --force and ignore
	errors for now.
	(all-local): Add $(INFOS).
	(install-local): Install info files.
	(uninstall): Uninstall info files.
	* docs/version.texi: Remove from revision control.  This file is
	automatically generated on build now.
	* gendistlist.sh: Add `*.info'.
2009-09-21 18:22:27 +00:00
blusseau
e8f5d6e985 2009-09-12 Yves Blusseau <blusseau@zetam.org>
Change clean rules to properly remove files

	* genmk.rb: add new clean rules
	* Makefile.in (clean): add the new targets
	(mostlyclean): likewise
2009-09-12 07:38:50 +00:00
blusseau
9a86f1ecb9 2009-09-06 Yves Blusseau <blusseau@zetam.org>
* Makefile.in (RMKFILES): add i386-qemu.rmk
    (MAINTAINER_CLEANFILES): add $(srcdir)/DISTLIST $(srcdir)/config.h.in
    $(srcdir)/stamp-h.in
2009-09-06 10:25:19 +00:00
proski
5496c37ebe 2009-08-21 Pavel Roskin <proski@gnu.org>
* Makefile.in (install-local): When checking if a file is in the
	build directory, use "test -e" to detect symlinks.
2009-08-21 21:42:58 +00:00
proski
7a9094e5bc 2009-08-21 Pavel Roskin <proski@gnu.org>
* Makefile.in (install-local): Remove all files in
	$(DESTDIR)$(pkglibdir) before installing new files there.
2009-08-21 21:40:58 +00:00
proski
5680109e00 2009-07-19 Pavel Roskin <proski@gnu.org>
* Makefile.in: Remove LIBLZO and enable_lzo.
	* conf/i386-pc.rmk: Remove lzo support.
	* configure.ac: Remove checks for lzo, don't define ENABLE_LZMA.
	* include/grub/i386/pc/kernel.h: Define ENABLE_LZMA.  Remove lzo
	support.
	* kern/i386/pc/lzo1x.S: Remove.
	* kern/i386/pc/startup.S: Remove lzo support.
	* util/i386/pc/grub-mkimage.c: Likewise.
2009-07-19 20:23:33 +00:00
phcoder
94414221cf 2009-07-16 Vladimir Serbinenko <phcoder@gmail.com>
Fix libusb

	* Makefile.in (LIBUSB): new macro
	* genmk.rb (Utility/print_tail): new method
	(Utility/rule): use intermediary variable #{prefix}_OBJECTS
	(top level): call util.print_tail at the end.
2009-07-16 14:53:33 +00:00
proski
999577f13c 2009-07-01 Pavel Roskin <proski@gnu.org>
* Makefile.in: Install include/grub/machine symlink.
2009-07-01 22:48:38 +00:00
proski
6f41557fb1 2009-07-01 Pavel Roskin <proski@gnu.org>
* Makefile.in: When installing symlinks, use "cp -fR", which
	works on FreeBSD and MacOSX.
	From Yves Blusseau <cl7m42e02@sneakemail.com>
2009-07-01 22:47:28 +00:00
proski
e40893c365 2009-06-12 Pavel Roskin <proski@gnu.org>
* Makefile.in (pkgdata_SRCDIR): Remove.  genmodsrc.sh and
	genmk.rb don't need to be generated or installed.
2009-06-12 20:11:19 +00:00
proski
0658e928cf 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in (uninstall): Uninstall manuals.
2009-06-12 02:42:26 +00:00
proski
ca0388f084 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in: Rename lib_DATA to lib_SCRIPTS, move it from
	PKGLIB to SCRIPTS.  This fixes installation of grub-mkconfig_lib
	and update-grub_lib in two places.
	* conf/common.rmk: Rename lib_DATA to lib_SCRIPTS.
2009-06-12 02:10:21 +00:00
proski
c1cb63ba4e 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in: Don't rely on any scripts being executable.
	Always use $(SHELL) to run shell scripts.
2009-06-11 21:00:57 +00:00
fzielcke
b39f9d20a9 remove all trailing whitespace 2009-06-10 21:04:23 +00:00
fzielcke
af3612634d 2009-06-08 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (uninstall): Remove all $lib_DATA files.
2009-06-08 13:11:58 +00:00
fzielcke
dd1a6caefa remove 2 echo's accidentally introduced in previous commit 2009-06-08 12:45:04 +00:00
fzielcke
e76fc92419 2009-06-08 Felix Zielcke <fzielcke@z-51.de>
* Makefile.in (uninstall): Remove all $include_DATA files.
2009-06-08 12:16:58 +00:00
phcoder
2b167a7218 2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
Check if compiler is apple cc

	* Makefile.in (ASFLAGS): new variable
	(TARGET_ASFLAGS): likewise
	(TARGET_MODULE_FORMAT): likewise
	(TARGET_APPLE_CC): likewise
	(OBJCONV): likewise
	(TARGET_IMG_CFLAGS): likewise
	(TARGET_CPPFLAGS): add includedir
	* configure.ac: call grub_apple_cc and grub_apple_target_cc
	(TARGET_IMG_LDFLAGS): Add -Wl,-Ttext,. All users updated
	Check for linker script only if compiler isn't Apple's CC
	(TARGET_MODULE_FORMAT): set
	(TARGET_APPLE_CC): likewise
	(TARGET_ASFLAGS): likewise
	(ASFLAGS): likewise
	Check for objcopy only if compiler isn't Apple's CC
	Check for BSS symbol only if compiler isn't Apple's CC
	* genmk.rb: adapt nm options if we use Apple's utils
	* aclocal.m4 (grub_apple_cc): new test
	(grub_apple_target_cc): likewise
2009-06-04 19:53:52 +00:00
phcoder
fb14123e01 2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
Simplify sed expressions and improve awk

	* Makefile.in (install-local): simplify sed expression
	* gencmdlist.sh: likewise
	* genmoddep.awk: avoid adding module as a dependency of itself
2009-06-04 19:39:51 +00:00
fzielcke
57788cfdf6 2009-05-28 Pavel Roskin <proski@gnu.org>
* Makefile.in: Don't use "cp -d", it doesn't work on FreeBSD.
	Remove the original symlink explicitly.

	* fs/hfs.c (grub_hfs_find_dir): Skip sequences of slashes, not
	just one slash.  That's how grub_fshelp_find_file() does it.
2009-06-03 13:49:52 +00:00
fzielcke
faa517ce50 * Makefile.in: Remove duplicated 2008 in Copyright line. 2009-05-04 17:57:31 +00:00
bean
fc45fb586d 2009-05-03 Bean <bean123ch@gmail.com>
* Makefile.in (enable_efiemu): New variable.

	* conf/i386-pc.rmk: Only compile efiemu runtimes when enable_efiemu is
	set.
	(efiemu32.o): Use macro $< for source file, add $(srcdir) to include
	path.
	(efi64_c.o): Use macro $< for source file, add $(srcdir) to include
	path, add -mno-red-zone option.
	(efiemu64_s.o): Likewise.
	(efiemu64.o): Use macro $^ for source file.

	* configure.ac (--enable-efiemu): New option.
2009-05-03 06:39:37 +00:00
proski
4006f85c89 2009-04-26 Pavel Roskin <proski@gnu.org>
* Makefile.in: Don't install empty manual pages if help2man is
	missing.  Use help2man option for output, not shell redirection.
2009-04-26 14:14:05 +00:00
phcoder
e434359358 2009-04-25 Vladimir Serbinenko <phcoder@gmail.com>
Parttool autoloading and improvements

	* Makefile.in (pkglib_DATA): add parttool.lst 
	(parttool.lst): new target
	* genmk.rb: generate parttool-*
	(CLEANFILES): add #{parttool}
	(PARTTOOLFILES): new variable
	* genparttoollist.sh: new file
	* parttool/pcpart.c (grub_pcpart_boot): more feedback 
	(grub_pcpart_type): likewise
	* commands/parttool.c (helpmsg): new variable
	(grub_cmd_parttool): output help if not enough arguments are supplied
	autoload modules
	(GRUB_MOD_INIT(parttool)): use helpmsg
2009-04-25 12:18:25 +00:00
bean
d05f0df3eb 2009-04-14 Bean <bean123ch@gmail.com>
* Makefile.in (pkglib_DATA): Add handler.lst.
	(handler.lst): New rule.

	* conf/i386-pc.rmk (normal_mod_SOURCES): Add normal/handler.c.
	* conf/i386-coreboot.rmk: Likewise.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-efi.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.

	* genhandlerlist.sh: New file.

	* genmk.rb: Add rules to generate handler.lst.

	* include/grub/normal.h (grub_file_getline): New function definition.
	(read_handler_list): Likewise.
	(free_handler_list): Likewise.

	* include/grub/term.h (grub_term_register_input): Add name parameter
	for auto generation of handler.lst.
	(grub_term_register_output): Likewise.

	* normal/handler.c: New file.

	* normal/main.c (get_line): Renamed to grub_file_getline.
	(read_config_file): Use the newly renamed grub_file_getline.
	(read_command_list): Likewise.
	(read_fs_list): Likewise.
	(grub_normal_execute): Call read_handler_list to parse handler.lst.
	(GRUB_MOD_FINI): Call free_handler_list to free handler list.

	* term/efi/console.c (grub_console_init): Add name parameter for auto
	generation of handler.lst.
	* term/gfxterm.c: Likewise.
	* term/i386/pc/at_keyboard.c: Likewise.
	* term/i386/pc/console.c: Likewise.
	* term/i386/pc/serial.c: Likewise.
	* term/i386/pc/vesafb.c: Likewise.
	* term/i386/pc/vga.c: Likewise.
	* term/i386/pc/vga_text.c: Likewise.
	* term/ieee1275/ofconsole.c: Likewise.
	* term/usb_keyboard.c: Likewise.
2009-04-14 18:12:14 +00:00
proski
3fcc20834c 2009-04-01 Pavel Roskin <proski@gnu.org>
* Makefile.in: Remove all references to MODULE_LDFLAGS, it's
	unused now.
	* genmk.rb: Likewise.
	* configure.ac: Likewise.
2009-04-01 16:17:20 +00:00
robertmh
9304eef146 2009-03-04 Robert Millan <rmh@aybabtu.com>
Filter /etc/grub.d/10_* so that only add-ons for native kernels are
        installed.

        * Makefile.in (host_kernel): New variable.
        * conf/common.rmk (grub-mkconfig_SCRIPTS): Conditionalize all 10_*.in
        scripts instead of just the windows one.
        * configure.ac: Initialize and AC_SUBST `host_kernel'.
2009-03-04 22:00:41 +00:00