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

review comments

Browse source
This commit is contained in:
BVK Chaitanya 2010-08-21 09:48:27 +05:30
parent 2bd591d03e
commit bdf0d62321
7 changed files with 12 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -46,7 +46,7 @@ CLEANFILES += libgrub_a_init.c
if COND_GRUB_MKFONT if COND_GRUB_MKFONT
if COND_HAVE_FONT_SOURCE if COND_HAVE_FONT_SOURCE
pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
endif endif
endif endif

2
Makefile.util.def
View file

@ -268,6 +268,7 @@ script = {
installdir = grubconf; installdir = grubconf;
}; };
/*
script = { script = {
name = '10_windows'; name = '10_windows';
source = util/grub.d/10_windows.in; source = util/grub.d/10_windows.in;
@ -279,6 +280,7 @@ script = {
source = util/grub.d/10_hurd.in; source = util/grub.d/10_hurd.in;
installdir = grubconf; installdir = grubconf;
}; };
*/
script = { script = {
name = '10_linux'; name = '10_linux';

3
conf/Makefile.common
View file

@ -77,9 +77,6 @@ CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))" CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
CFLAGS_MKISOFS = -Wno-all -Werror
CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
CFLAGS_POSIX = -fno-builtin CFLAGS_POSIX = -fno-builtin
CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap

54
conf/Makefile.extra-dist
View file

@ -1,5 +1,3 @@
EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
EXTRA_DIST += autogen.sh EXTRA_DIST += autogen.sh
EXTRA_DIST += geninit.sh EXTRA_DIST += geninit.sh
@ -28,50 +26,8 @@ EXTRA_DIST += grub-core/genterminallist.sh
EXTRA_DIST += grub-core/genparttoollist.sh EXTRA_DIST += grub-core/genparttoollist.sh
EXTRA_DIST += grub-core/genemuinitheader.sh EXTRA_DIST += grub-core/genemuinitheader.sh
EXTRA_DIST += grub-core/gnulib/getopt.h EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
EXTRA_DIST += grub-core/gnulib/argp-version-etc.h EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
EXTRA_DIST += grub-core/gnulib/fnmatch.h EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
EXTRA_DIST += grub-core/gnulib/error.h EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/posix_wrap -name '*.h')
EXTRA_DIST += grub-core/gnulib/argp-namefrob.h EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/libgcrypt_wrap -name '*.h')
EXTRA_DIST += grub-core/gnulib/argp.h
EXTRA_DIST += grub-core/gnulib/argp-fmtstream.h
EXTRA_DIST += grub-core/gnulib/gettext.h
EXTRA_DIST += grub-core/gnulib/regex_internal.h
EXTRA_DIST += grub-core/gnulib/progname.h
EXTRA_DIST += grub-core/gnulib/regex.h
EXTRA_DIST += grub-core/gnulib/alloca.h
EXTRA_DIST += grub-core/gnulib/getopt_int.h
EXTRA_DIST += grub-core/efiemu/runtime/config.h
EXTRA_DIST += grub-core/lib/posix_wrap/localcharset.h
EXTRA_DIST += grub-core/lib/posix_wrap/ctype.h
EXTRA_DIST += grub-core/lib/posix_wrap/limits.h
EXTRA_DIST += grub-core/lib/posix_wrap/stdio.h
EXTRA_DIST += grub-core/lib/posix_wrap/sys/types.h
EXTRA_DIST += grub-core/lib/posix_wrap/unistd.h
EXTRA_DIST += grub-core/lib/posix_wrap/locale.h
EXTRA_DIST += grub-core/lib/posix_wrap/wchar.h
EXTRA_DIST += grub-core/lib/posix_wrap/string.h
EXTRA_DIST += grub-core/lib/posix_wrap/langinfo.h
EXTRA_DIST += grub-core/lib/posix_wrap/wctype.h
EXTRA_DIST += grub-core/lib/posix_wrap/stdint.h
EXTRA_DIST += grub-core/lib/posix_wrap/stdlib.h
EXTRA_DIST += grub-core/lib/posix_wrap/assert.h
EXTRA_DIST += grub-core/lib/posix_wrap/errno.h
EXTRA_DIST += grub-core/lib/libgcrypt_wrap/cipher_wrap.h
EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rijndael-tables.h
EXTRA_DIST += grub-core/lib/libgcrypt/cipher/bithelp.h
EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rmd.h
EXTRA_DIST += grub-core/lib/libgcrypt/cipher/hash-common.h
EXTRA_DIST += grub-core/lib/libgcrypt/cipher/camellia.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/types.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/cipher.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rijndael-tables.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/memory.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/bithelp.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/g10lib.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rmd.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/hash-common.h
EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/camellia.h

6
configure.ac
View file

@ -71,13 +71,11 @@ case "$target_cpu" in
sparc) target_cpu=sparc64 ;; sparc) target_cpu=sparc64 ;;
mipsel|mips64el) mipsel|mips64el)
target_cpu=mips; target_cpu=mips;
HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPSEL=1"; machine_CFLAGS="-DGRUB_CPU_MIPSEL=1";
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
;; ;;
mips|mips64) mips|mips64)
target_cpu=mips; target_cpu=mips;
HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPS=1"; machine_CFLAGS="-DGRUB_CPU_MIPS=1";
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPS=1";
;; ;;
esac esac

2
docs/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
AM_MAKEINFOFLAGS = --force --no-split --no-validate # AM_MAKEINFOFLAGS = --no-split --no-validate
info_TEXINFOS = grub.texi info_TEXINFOS = grub.texi
grub_TEXINFOS = fdl.texi grub_TEXINFOS = fdl.texi

3
grub-core/Makefile.am
View file

@ -34,8 +34,7 @@ gentrigtables: gentrigtables.c
CLEANFILES += gentrigtables CLEANFILES += gentrigtables
# trigtables.c # trigtables.c
trigtables.c: gentrigtables.c $(top_srcdir)/configure.ac trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) gentrigtables
$(builddir)/gentrigtables > $@ $(builddir)/gentrigtables > $@
CLEANFILES += trigtables.c CLEANFILES += trigtables.c