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

2008-08-09 Christian Franke <franke@computer.org> 

* Makefile.in: Add `target_os' and `enable_grub_pe2elf'.
	* conf/common.rmk: Install `grub-pe2elf' only if requested.
	Install `grub.d/10_windows' only on Cygwin.
	* configure.ac: Add subst of `target_os'.
	Check `target_os' also before setting TARGET_OBJ2ELF.
	Add `--enable-grub-pe2elf'.
This commit is contained in:
chrfranke 2008-08-09 12:30:26 +00:00
parent 042bd419da
commit 2d05bc6a3e
6 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-08-09 Christian Franke <franke@computer.org>
* Makefile.in: Add `target_os' and `enable_grub_pe2elf'.
* conf/common.rmk: Install `grub-pe2elf' only if requested.
Install `grub.d/10_windows' only on Cygwin.
* configure.ac: Add subst of `target_os'.
Check `target_os' also before setting TARGET_OBJ2ELF.
Add `--enable-grub-pe2elf'.
2008-08-08 Robert Millan <rmh@aybabtu.com>
* kern/disk.c: Replace `<grub/machine/time.h>' with `<grub/time.h>'.

2
Makefile.in
View File

@ -48,6 +48,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
target_cpu = @target_cpu@
target_os = @target_os@
platform = @platform@
INSTALL = @INSTALL@
@ -92,6 +93,7 @@ UNIFONT_HEX = @UNIFONT_HEX@
# Options.
enable_grub_emu = @enable_grub_emu@
enable_grub_fstest = @enable_grub_fstest@
enable_grub_pe2elf = @enable_grub_pe2elf@
enable_lzo = @enable_lzo@
### General variables.

9
conf/common.mk
View File

@ -459,7 +459,10 @@ grub_editenv-kern_err.o: kern/err.c $(kern/err.c_DEPENDENCIES)
CLEANFILES += grub-editenv
# for grub-pe2elf
ifeq ($(enable_grub_pe2elf), yes)
bin_UTILITIES += grub-pe2elf
endif
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
CLEANFILES += grub-pe2elf$(EXEEXT) grub_pe2elf-util_grub_pe2elf.o grub_pe2elf-util_misc.o
MOSTLYCLEANFILES += grub_pe2elf-util_grub_pe2elf.d grub_pe2elf-util_misc.d
@ -493,7 +496,11 @@ CLEANFILES += update-grub_lib
%: util/grub.d/%.in config.status
./config.status --file=$@:$<
chmod +x $@
update-grub_SCRIPTS = 00_header 10_linux 10_hurd 10_windows 30_os-prober 40_custom
update-grub_SCRIPTS = 00_header 10_linux 10_hurd 30_os-prober 40_custom
ifeq ($(target_os), cygwin)
update-grub_SCRIPTS += 10_windows
endif
CLEANFILES += $(update-grub_SCRIPTS)
update-grub_DATA += util/grub.d/README

9
conf/common.rmk
View File

@ -100,7 +100,10 @@ grub_editenv_SOURCES = util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c
CLEANFILES += grub-editenv
# for grub-pe2elf
ifeq ($(enable_grub_pe2elf), yes)
bin_UTILITIES += grub-pe2elf
endif
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
CLEANFILES += grub-pe2elf
@ -120,7 +123,11 @@ CLEANFILES += update-grub_lib
%: util/grub.d/%.in config.status
./config.status --file=$@:$<
chmod +x $@
update-grub_SCRIPTS = 00_header 10_linux 10_hurd 10_windows 30_os-prober 40_custom
update-grub_SCRIPTS = 00_header 10_linux 10_hurd 30_os-prober 40_custom
ifeq ($(target_os), cygwin)
update-grub_SCRIPTS += 10_windows
endif
CLEANFILES += $(update-grub_SCRIPTS)
update-grub_DATA += util/grub.d/README

21
configure vendored
View File

@ -702,6 +702,7 @@ MODULE_LDFLAGS
LIBCURSES
enable_grub_emu
enable_grub_fstest
enable_grub_pe2elf
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@ -1300,6 +1301,8 @@ Optional Features:
--enable-grub-emu build and install the `grub-emu' debugging utility
--enable-grub-fstest build and install the `grub-fstest' debugging
utility
--enable-grub-pe2elf build and install the `grub-pe2elf' conversion
utility
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1993,6 +1996,7 @@ esac
#
# Checks for build programs.
#
@ -5901,9 +5905,10 @@ echo "${ECHO_T}$TARGET_IMG_LDFLAGS_AC" >&6; }
# For platforms where ELF is not the default link format.
{ echo "$as_me:$LINENO: checking for command to convert module to ELF format" >&5
echo $ECHO_N "checking for command to convert module to ELF format... $ECHO_C" >&6; }
if test "$host_os" = cygwin; then
TARGET_OBJ2ELF='grub-pe2elf.exe'
fi
case "${host_os}:${target_os}" in
cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
*) ;;
esac
{ echo "$as_me:$LINENO: result: $TARGET_OBJ2ELF" >&5
echo "${ECHO_T}$TARGET_OBJ2ELF" >&6; }
@ -8363,6 +8368,13 @@ fi
# Check whether --enable-grub-pe2elf was given.
if test "${enable_grub_pe2elf+set}" = set; then
enableval=$enable_grub_pe2elf;
fi
# Output files.
ac_config_links="$ac_config_links include/grub/cpu:include/grub/$target_cpu include/grub/machine:include/grub/$target_cpu/$platform"
@ -9083,11 +9095,12 @@ MODULE_LDFLAGS!$MODULE_LDFLAGS$ac_delim
LIBCURSES!$LIBCURSES$ac_delim
enable_grub_emu!$enable_grub_emu$ac_delim
enable_grub_fstest!$enable_grub_fstest$ac_delim
enable_grub_pe2elf!$enable_grub_pe2elf$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13
configure.ac
View File

@ -100,6 +100,7 @@ case "$target_cpu" in
esac
AC_SUBST(target_cpu)
AC_SUBST(target_os)
AC_SUBST(platform)
#
@ -206,9 +207,10 @@ AC_MSG_RESULT([$TARGET_IMG_LDFLAGS_AC])
# For platforms where ELF is not the default link format.
AC_MSG_CHECKING([for command to convert module to ELF format])
if test "$host_os" = cygwin; then
TARGET_OBJ2ELF='grub-pe2elf.exe'
fi
case "${host_os}:${target_os}" in
cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
*) ;;
esac
AC_SUBST(TARGET_OBJ2ELF)
AC_MSG_RESULT([$TARGET_OBJ2ELF])
@ -385,6 +387,11 @@ AC_ARG_ENABLE([grub-fstest],
[build and install the `grub-fstest' debugging utility])])
AC_SUBST([enable_grub_fstest])
AC_ARG_ENABLE([grub-pe2elf],
[AS_HELP_STRING([--enable-grub-pe2elf],
[build and install the `grub-pe2elf' conversion utility])])
AC_SUBST([enable_grub_pe2elf])
# Output files.
AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu
include/grub/machine:include/grub/$target_cpu/$platform])