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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -1,6 +1,5 @@
AUTOMAKE_OPTIONS = subdir-objects
DEPDIR = .deps-util
SUBDIRS = . grub-core po docs
EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
@ -23,13 +22,15 @@ AM_CCASFLAGS = $(CCASFLAGS_GRUB)
include $(srcdir)/modules.am
# XXX Use Automake's LEX & YACC support
grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
grub_script.tab.c: grub_script.tab.h
CLEANFILES += grub_script.tab.c grub_script.tab.h
# For the lexer.
grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
grub_script.yy.c: grub_script.yy.h
CLEANFILES += grub_script.yy.c grub_script.yy.h
# For libgrub.a

2
docs/Makefile.am
View file

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

8
gentpl.py
View file

@ -17,6 +17,8 @@ GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
GROUPS["x86"] = GROUPS["i386"] + GROUPS["x86_64"]
GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
GROUPS["ieee1275"] = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
GROUPS["pci"] = GROUPS["x86"] + GROUPS["mips"]
GROUPS["nonemu"] = GRUB_PLATFORMS[:]
GROUPS["nonemu"].remove("emu")
@ -157,6 +159,7 @@ def shared_nodist_sources(): return "[+ FOR nodist_shared +] [+ .nodist_shared +
def platform_sources(p): return platform_specific_values(p, "source", "")
def platform_nodist_sources(p): return platform_specific_values(p, "nodist", "_nodist")
def platform_extra_dist(p): return platform_specific_values(p, "extra_dist", "_extra_dist")
def platform_dependencies(p): return platform_specific_values(p, "dependencies", "_dependencies")
def platform_ldadd(p): return platform_specific_values(p, "ldadd", "_ldadd")
def platform_cflags(p): return platform_specific_values(p, "cflags", "_cflags")
@ -181,6 +184,7 @@ def module(platform):
r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
# r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@ -271,6 +275,7 @@ def kernel(platform):
r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform))
# r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@ -296,6 +301,7 @@ def image(platform):
r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform))
# r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@ -322,6 +328,7 @@ def library(platform):
r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
# r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@ -364,6 +371,7 @@ def program(platform, test=False):
r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
# r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")

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;

38
modules.def
View file

@ -90,13 +90,16 @@ library = {
source = grub-core/script/lexer.c;
source = grub-core/script/main.c;
source = grub-core/script/script.c;
nodist = grub_script.yy.h;
nodist = grub_script.tab.h;
};
program = {
name = grub-bin2h;
source = util/bin2h.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
mansection = 1;
};
@ -109,8 +112,7 @@ program = {
extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
};
@ -121,7 +123,7 @@ program = {
source = util/grub-mkrelpath.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
};
program = {
@ -131,7 +133,7 @@ program = {
source = util/grub-script-check.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
};
program = {
@ -141,7 +143,7 @@ program = {
source = util/grub-editenv.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
};
program = {
@ -151,7 +153,7 @@ program = {
source = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
};
@ -169,7 +171,7 @@ program = {
source = util/grub-pe2elf.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
condition = COND_GRUB_PE2ELF;
};
@ -179,7 +181,7 @@ program = {
source = util/grub-fstest.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldflags = '$(LIBINTL)';
condition = COND_GRUB_FSTEST;
};
@ -187,13 +189,13 @@ program = {
name = grub-mkfont;
mansection = 1;
source = util/grub-mkfont.c;
nodist = grub-core/unidata.c;
source = grub-core/unidata.c;
cflags = '$(freetype_cflags)';
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldadd = '$(freetype_libs)';
ldflags = '$(LIBINTL)';
ldflags = '$(freetype_libs)';
condition = COND_GRUB_MKFONT;
};
@ -211,8 +213,8 @@ program = {
sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldadd = '$(LIBUTIL)';
ldflags = '$(LIBINTL)';
ldflags = '$(LIBUTIL)';
};
program = {
@ -222,8 +224,8 @@ program = {
source = util/grub-probe.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldadd = '$(LIBUTIL)';
ldflags = '$(LIBINTL)';
ldflags = '$(LIBUTIL)';
};
program = {
@ -240,8 +242,8 @@ program = {
sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldadd = '$(LIBUTIL)';
ldflags = '$(LIBINTL)';
ldflags = '$(LIBUTIL)';
enable = i386_pc;
enable = sparc64_ieee1275;