cleanup
This commit is contained in:
BVK Chaitanya
parent
bd7390ee84
commit
a60f6ee1ac
15 changed files with 131 additions and 343 deletions
|
|
@ -27,24 +27,14 @@ EXTRA_DIST += genhandlerlist.sh
|
|||
EXTRA_DIST += genpartmaplist.sh
|
||||
EXTRA_DIST += genparttoollist.sh
|
||||
EXTRA_DIST += genterminallist.sh
|
||||
|
||||
EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
|
||||
EXTRA_DIST += lib/libgcrypt-grub/cipher/crypto.lst
|
||||
|
||||
EXTRA_DIST += script/yylex.l
|
||||
EXTRA_DIST += script/parser.y
|
||||
|
||||
EXTRA_DIST += lib/relocator.c
|
||||
|
||||
EXTRA_DIST += efiemu/loadcore.c
|
||||
EXTRA_DIST += efiemu/prepare.c
|
||||
|
||||
EXTRA_DIST += loader/machoXX.c
|
||||
|
||||
|
||||
EXTRA_DIST += kern/i386/loader.S
|
||||
EXTRA_DIST += kern/i386/realmode.S
|
||||
EXTRA_DIST += loader/i386/bsdXX.c
|
||||
EXTRA_DIST += loader/i386/bsd_pagetable.c
|
||||
EXTRA_DIST += loader/i386/multiboot_elfxx.c
|
||||
EXTRA_DIST += commands/search.c
|
||||
|
||||
EXTRA_DIST += kern/i386/pc/lzma_decode.S
|
||||
|
|
|
|||
|
|
@ -33,21 +33,22 @@ if COND_sparc64_ieee1275
|
|||
endif
|
||||
|
||||
CPPFLAGS_GRUB = -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
|
||||
CPPFLAGS_GRUB += -I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
|
||||
CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
|
||||
|
||||
CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
|
||||
CPPFLAGS_GCRY = -I$(top_srcdir)/lib/libgcrypt_wrap
|
||||
CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
|
||||
|
||||
CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
|
||||
CPPFLAGS_GNULIB = -I$(top_srcdir)/gnulib
|
||||
CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
|
||||
|
||||
CFLAGS_MKISOFS = -Wno-all -Werror
|
||||
CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
|
||||
|
||||
CFLAGS_POSIX = -fno-builtin
|
||||
CPPFLAGS_POSIX = -I$(top_srcdir)/lib/posix_wrap
|
||||
CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
|
||||
|
||||
CPPFLAGS_EFIEMU = -I$(top_srcdir)/efiemu/runtime
|
||||
CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
|
||||
|
||||
# to calm down automake
|
||||
BUILT_SOURCES =
|
||||
|
|
|
|||
|
|
@ -44,28 +44,12 @@ AC_CONFIG_HEADER([config.h])
|
|||
|
||||
m4_include([configure.common])
|
||||
|
||||
TARGET_CPP="$TARGET_CC -E"
|
||||
TARGET_CCAS=$TARGET_CC
|
||||
|
||||
CC=$TARGET_CC
|
||||
CPP=$TARGET_CC
|
||||
CCAS=$TARGET_CC
|
||||
|
||||
AC_SUBST(TARGET_CC)
|
||||
AC_SUBST(TARGET_CPP)
|
||||
AC_SUBST(TARGET_CCAS)
|
||||
AC_SUBST(TARGET_IMG_LDSCRIPT)
|
||||
AC_SUBST(TARGET_IMG_LDFLAGS)
|
||||
AC_SUBST(TARGET_IMG_CFLAGS)
|
||||
AC_SUBST(TARGET_OBJ2ELF)
|
||||
AC_SUBST(TARGET_MODULE_FORMAT)
|
||||
AC_SUBST(OBJCONV)
|
||||
AC_SUBST(TARGET_APPLE_CC)
|
||||
AC_SUBST(ASFLAGS)
|
||||
AC_SUBST(TARGET_CFLAGS)
|
||||
AC_SUBST(TARGET_ASFLAGS)
|
||||
AC_SUBST(TARGET_LDFLAGS)
|
||||
AC_SUBST(TARGET_CPPFLAGS)
|
||||
grub_coredir='.'
|
||||
AC_SUBST(grub_coredir)
|
||||
|
||||
# Output files.
|
||||
grub_CHECK_LINK_DIR
|
||||
|
|
@ -77,10 +61,10 @@ if test x"$link_dir" = xyes ; then
|
|||
else
|
||||
mkdir -p include/grub 2>/dev/null
|
||||
rm -rf include/grub/cpu
|
||||
cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
|
||||
cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
|
||||
if test "$platform" != emu ; then
|
||||
rm -rf include/grub/machine
|
||||
cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
|
||||
cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# Copyright (C) 2005, 2008, 2009 Free Software Foundation, Inc.
|
||||
#
|
||||
# This gendistlist.sh is free software; the author
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
# Generate a list of distributed files.
|
||||
|
||||
EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
|
||||
THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
|
||||
config.h.in config.sub configure configure.ac gencmdlist.sh \
|
||||
gendistlist.sh genfslist.sh genhandlerlist.sh geninit.sh \
|
||||
geninitheader.sh genkernsyms.sh.in genmk.rb genmoddep.awk \
|
||||
genmodsrc.sh genpartmaplist.sh genparttoollist.sh \
|
||||
genvideolist.sh \
|
||||
gensymlist.sh.in install-sh mkinstalldirs stamp-h.in"
|
||||
|
||||
DISTDIRS="boot bus commands conf disk docs efiemu font fs hello hook include io \
|
||||
kern lib loader mmap normal partmap parttool script term util video"
|
||||
|
||||
LC_COLLATE=C
|
||||
export LC_COLLATE
|
||||
|
||||
for f in $EXTRA_DISTFILES; do
|
||||
echo $f
|
||||
done
|
||||
|
||||
dir=`dirname $0`
|
||||
cd $dir
|
||||
|
||||
for dir in $DISTDIRS; do
|
||||
for d in `find $dir -type d ! -name .svn ! -name .bzr | sort`; do
|
||||
find $d -maxdepth 1 -name '*.[chSy]' -o -name '*.mk' -o -name '*.rmk' \
|
||||
-o -name '*.rb' -o -name '*.in' -o -name '*.tex' -o -name '*.texi' \
|
||||
-o -name '*.info' -o -name 'grub.cfg' -o -name 'README' \
|
||||
-o -name '*.sc' -o -name 'mdate-sh' -o -name '*.sh' \
|
||||
-o -name 'grub-dumpdevtree' -o -name '*.lua' | sort
|
||||
done
|
||||
done
|
||||
|
|
@ -22,10 +22,7 @@ BEGIN {
|
|||
{
|
||||
module = $2
|
||||
|
||||
# skip if empty
|
||||
if ($1 == "" || $2 == "")
|
||||
;
|
||||
else if ($1 in symtab) {
|
||||
if ($1 in symtab) {
|
||||
modtab[module] = modtab[module] " " symtab[$1];
|
||||
}
|
||||
else if ($1 != "__gnu_local_gp") {
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@ int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
|
|||
int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
|
||||
void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
|
||||
grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
|
||||
grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
|
||||
grub_dl_t mod);
|
||||
grub_err_t grub_dl_register_symbol (const char *name, void *addr,
|
||||
grub_dl_t mod);
|
||||
|
||||
grub_err_t grub_arch_dl_check_header (void *ehdr);
|
||||
grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
|
||||
|
|
|
|||
|
|
@ -348,6 +348,19 @@ module = {
|
|||
library = {
|
||||
name = libgnulib.a;
|
||||
source = gnulib/regex.c;
|
||||
|
||||
extra_dist = gnulib/progname.h;
|
||||
extra_dist = gnulib/alloca.h;
|
||||
extra_dist = gnulib/error.h;
|
||||
extra_dist = gnulib/fnmatch.h;
|
||||
extra_dist = gnulib/getopt.h;
|
||||
extra_dist = gnulib/getopt_int.h;
|
||||
extra_dist = gnulib/gettext.h;
|
||||
extra_dist = gnulib/regcomp.c;
|
||||
extra_dist = gnulib/regexec.c;
|
||||
extra_dist = gnulib/fnmatch_loop.c;
|
||||
extra_dist = gnulib/regex_internal.c;
|
||||
|
||||
cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
|
||||
cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
|
||||
common;
|
||||
|
|
@ -823,6 +836,11 @@ module = {
|
|||
i386_pc = efiemu/prepare64.c;
|
||||
i386_pc = efiemu/pnvram.c;
|
||||
i386_pc = efiemu/i386/coredetect.c;
|
||||
|
||||
extra_dist = efiemu/prepare.c;
|
||||
extra_dist = efiemu/loadcore.c;
|
||||
extra_dist = efiemu/runtime/efiemu.S;
|
||||
extra_dist = efiemu/runtime/efiemu.c;
|
||||
};
|
||||
|
||||
module = {
|
||||
|
|
@ -1216,6 +1234,7 @@ module = {
|
|||
x86 = lib/i386/relocator.c;
|
||||
x86 = lib/i386/relocator_asm.S;
|
||||
x86 = lib/i386/relocator_backward.S;
|
||||
extra_dist = lib/relocator.c;
|
||||
};
|
||||
|
||||
module = {
|
||||
|
|
@ -1280,6 +1299,7 @@ module = {
|
|||
name = multiboot;
|
||||
source = loader/multiboot.c;
|
||||
source = loader/i386/multiboot_mbi.c;
|
||||
extra_dist = loader/multiboot_elfxx.c;
|
||||
x86;
|
||||
};
|
||||
|
||||
|
|
@ -1312,6 +1332,8 @@ module = {
|
|||
i386_pc = loader/macho64.c;
|
||||
i386_pc = loader/macho.c;
|
||||
i386_pc = loader/xnu.c;
|
||||
|
||||
extra_dist = loader/machoXX.c;
|
||||
};
|
||||
|
||||
module = {
|
||||
|
|
@ -1445,6 +1467,10 @@ module = {
|
|||
nodist = grub_script.yy.c;
|
||||
nodist = grub_script.tab.h;
|
||||
nodist = grub_script.yy.h;
|
||||
|
||||
extra_dist = script/yylex.l;
|
||||
extra_dist = script/parser.y;
|
||||
|
||||
cflags = '$(CFLAGS_POSIX) -Wno-error';
|
||||
cppflags = '$(CPPFLAGS_POSIX)';
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue