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

builds w/o custom DEPDIR

Browse source
This commit is contained in:
BVK Chaitanya 2010-08-06 10:01:54 +05:30
parent f6023b613f
commit 02c9030aae
7 changed files with 48 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

11
grub-core/Makefile.am
View file

@ -1,7 +1,6 @@
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = po
DEPDIR = .deps-core
EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
@ -53,17 +52,15 @@ trigtables.c: gentrigtables.c configure.ac
CLEANFILES += trigtables.c
# XXX Use Automake's LEX & YACC support
# See Recording Dependencies Manually in automake doc for below rules
script/sh_module-lexer.$(OBJEXT):grub_script.tab.h
grub_script.tab.c grub_script.tab.h: $(top_srcdir)/script/parser.y
grub_script.tab.h: $(top_srcdir)/script/parser.y
$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
grub_script.tab.c: grub_script.tab.h
CLEANFILES += grub_script.tab.c grub_script.tab.h
# For the lexer.
# See Recording Dependencies Manually in automake doc for below rules
script/sh_module-lexer.$(OBJEXT):grub_script.yy.h
grub_script.yy.c grub_script.yy.h: $(top_srcdir)/script/yylex.l
grub_script.yy.h: $(top_srcdir)/script/yylex.l
$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
grub_script.yy.c: grub_script.yy.h
CLEANFILES += grub_script.yy.c grub_script.yy.h
include $(srcdir)/modules.am

4
grub-core/configure.ac
View file

@ -60,13 +60,15 @@ CCAS=$TARGET_CC
grub_CHECK_LINK_DIR
if test x"$link_dir" = xyes ; then
AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
cp -rp $srcdir/lib/$target_cpu lib/target_cpu
if test "$platform" != emu ; then
AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
fi
else
mkdir -p include/grub 2>/dev/null
rm -rf include/grub/cpu
cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
cp -rp $srcdir/lib/$target_cpu lib/target_cpu 2>/dev/null
if test "$platform" != emu ; then
rm -rf include/grub/machine
cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null

36
grub-core/modules.def
View file

@ -584,14 +584,6 @@ module = {
module = {
name = lsmmap;
source = commands/lsmmap.c;
enable = i386_pc;
enable = i386_qemu;
enable = i386_coreboot;
enable = i386_multiboot;
enable = i386_ieee1275;
enable = mips_yeeloong;
enable = powerpc_ieee1275;
};
module = {
@ -1215,12 +1207,7 @@ module = {
module = {
name = setjmp;
i386 = lib/i386/setjmp.S;
x86_64 = lib/x86_64/setjmp.S;
mips = lib/mips/setjmp.S;
sparc64 = lib/sparc64/setjmp.S;
powerpc = lib/powerpc/setjmp.S;
emu = 'lib/$(target_cpu)/setjmp.S';
source = lib/target_cpu/setjmp.S;
};
module = {
@ -1289,19 +1276,12 @@ module = {
module = {
name = xnu;
x86_efi = loader/xnu_resume.c;
x86_efi = loader/i386/xnu.c;
x86_efi = loader/macho32.c;
x86_efi = loader/macho64.c;
x86_efi = loader/macho.c;
x86_efi = loader/xnu.c;
i386_pc = loader/xnu_resume.c;
i386_pc = loader/i386/xnu.c;
i386_pc = loader/macho32.c;
i386_pc = loader/macho64.c;
i386_pc = loader/macho.c;
i386_pc = loader/xnu.c;
source = loader/xnu_resume.c;
source = loader/i386/xnu.c;
source = loader/macho32.c;
source = loader/macho64.c;
source = loader/macho.c;
source = loader/xnu.c;
extra_dist = loader/machoXX.c;
enable = i386_pc;
@ -1383,7 +1363,7 @@ module = {
source = script/function.c;
source = script/lexer.c;
nodist = unidata.c;
source = unidata.c;
nodist = grub_script.tab.c;
nodist = grub_script.yy.c;
nodist = grub_script.tab.h;