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

rename libutil to libgrub

Browse source
This commit is contained in:
BVK Chaitanya 2010-06-04 09:34:28 +05:30
parent 1896a4aacb
commit d5c3b7ce01
3 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile.am
View file

@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
DEPDIR = .deps-util
EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
DEPDIR = .deps-util
SUBDIRS = . grub-core po docs SUBDIRS = . grub-core po docs
EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
include $(top_srcdir)/grub-core/Makefile.vars include $(top_srcdir)/grub-core/Makefile.vars
@ -32,19 +32,19 @@ grub_script.yy.c 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 $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
CLEANFILES += grub_script.yy.c grub_script.yy.h CLEANFILES += grub_script.yy.c grub_script.yy.h
# For libutil.a # For libgrub.a
libutil.pp: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES) libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrub_a_SOURCES)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrub_a_CPPFLAGS) $(CPPFLAGS) \
-D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
CLEANFILES += libutil.pp CLEANFILES += libgrub.pp
libutil_a_init.lst: libutil.pp libgrub_a_init.lst: libgrub.pp
cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1) cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
CLEANFILES += libutil_a_init.lst CLEANFILES += libgrub_a_init.lst
libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1) sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
CLEANFILES += libutil_a_init.c CLEANFILES += libgrub_a_init.c
if COND_GRUB_MKFONT if COND_GRUB_MKFONT
if COND_HAVE_FONT_SOURCE if COND_HAVE_FONT_SOURCE

1
grub-core/Makefile.am
View file

@ -1,4 +1,5 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = po SUBDIRS = po
DEPDIR = .deps-core DEPDIR = .deps-core
EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk

30
modules.def
View file

@ -1,13 +1,13 @@
AutoGen definitions Makefile.tpl; AutoGen definitions Makefile.tpl;
library = { library = {
name = libutil.a; name = libgrub.a;
cflags = '$(CFLAGS_GCRY)'; cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)'; cppflags = '$(CPPFLAGS_GCRY)';
nodist = grub_script.tab.c; nodist = grub_script.tab.c;
nodist = grub_script.yy.c; nodist = grub_script.yy.c;
nodist = libutil_a_init.c; nodist = libgrub_a_init.c;
source = grub-core/gnulib/error.c; source = grub-core/gnulib/error.c;
source = grub-core/gnulib/fnmatch.c; source = grub-core/gnulib/fnmatch.c;
@ -98,7 +98,7 @@ library = {
program = { program = {
name = grub-bin2h; name = grub-bin2h;
source = util/bin2h.c; source = util/bin2h.c;
ldadd = libutil.a; ldadd = libgrub.a;
mansection = 1; mansection = 1;
common; common;
}; };
@ -111,7 +111,7 @@ program = {
source = util/resolve.c; source = util/resolve.c;
extra_dist = util/grub-mkimagexx.c; extra_dist = util/grub-mkimagexx.c;
ldadd = libutil.a; ldadd = libgrub.a;
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"'; cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"';
common; common;
@ -123,7 +123,7 @@ program = {
source = util/grub-mkrelpath.c; source = util/grub-mkrelpath.c;
ldadd = libutil.a; ldadd = libgrub.a;
common; common;
}; };
@ -133,7 +133,7 @@ program = {
source = util/grub-script-check.c; source = util/grub-script-check.c;
ldadd = libutil.a; ldadd = libgrub.a;
common; common;
}; };
@ -143,7 +143,7 @@ program = {
source = util/grub-editenv.c; source = util/grub-editenv.c;
ldadd = libutil.a; ldadd = libgrub.a;
common; common;
}; };
@ -153,7 +153,7 @@ program = {
source = util/grub-mkpasswd-pbkdf2.c; source = util/grub-mkpasswd-pbkdf2.c;
ldadd = libutil.a; ldadd = libgrub.a;
cflags = '$(CFLAGS_GCRY)'; cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)'; cppflags = '$(CPPFLAGS_GCRY)';
common; common;
@ -170,7 +170,7 @@ program = {
mansection = 1; mansection = 1;
source = util/grub-pe2elf.c; source = util/grub-pe2elf.c;
ldadd = libutil.a; ldadd = libgrub.a;
}; };
program = { program = {
@ -178,7 +178,7 @@ program = {
mansection = 1; mansection = 1;
source = util/grub-fstest.c; source = util/grub-fstest.c;
ldadd = libutil.a; ldadd = libgrub.a;
enable = COND_GRUB_FSTEST; enable = COND_GRUB_FSTEST;
common; common;
}; };
@ -188,7 +188,7 @@ program = {
mansection = 1; mansection = 1;
source = util/grub-mkfont.c; source = util/grub-mkfont.c;
ldadd = libutil.a; ldadd = libgrub.a;
cflags = '$(freetype_cflags)'; cflags = '$(freetype_cflags)';
ldflags = '$(freetype_libs)'; ldflags = '$(freetype_libs)';
common; common;
@ -208,7 +208,7 @@ program = {
sparc64_ieee1275 = util/ieee1275/ofpath.c; sparc64_ieee1275 = util/ieee1275/ofpath.c;
sparc64_ieee1275 = util/ieee1275/devicemap.c; sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libutil.a; ldadd = libgrub.a;
common; common;
}; };
@ -218,7 +218,7 @@ program = {
mansection = 8; mansection = 8;
source = util/grub-probe.c; source = util/grub-probe.c;
ldadd = libutil.a; ldadd = libgrub.a;
common; common;
}; };
@ -235,7 +235,7 @@ program = {
sparc64_ieee1275 = util/raid.c; sparc64_ieee1275 = util/raid.c;
sparc64_ieee1275 = util/lvm.c; sparc64_ieee1275 = util/lvm.c;
ldadd = libutil.a; ldadd = libgrub.a;
}; };
program = { program = {
@ -244,7 +244,7 @@ program = {
source = util/ieee1275/grub-ofpathname.c; source = util/ieee1275/grub-ofpathname.c;
source = util/ieee1275/ofpath.c; source = util/ieee1275/ofpath.c;
ldadd = libutil.a; ldadd = libgrub.a;
sparc64_ieee1275; sparc64_ieee1275;
}; };