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

Use gnulib-tool to create gnulib source files.

Browse source 
* Add gnulib files generated by gnulib-tool in build-aux, m4 and
    grub-core/gnulib directories
    * .bzignore: Add **/.deps and autogenerated gnulib files
    * configure.ac: Assign auxiliary directory to build-aux, add invocation
    of gnulib macros, add grub-core/gnulib/Makefile
    * Makefile.am: Add gnulib directory in SUBDIRS (removing unnecessary .),
    include m4 directory to aclocal.
    * Makefile.util.def: Remove direct compilation of gnulib source files
    and use the new grub-core/gnulib/libgnu.a.
    * build-aux/config.rpath: move config.rpath from top directory to
    build-aux
    * conf/Makefile.common: Remove the macro _GL_UNUSED already defined
    in gnulib headers
    * conf/Makefile.extra-dist: Add m4/gnulib-cache.m4
    * grub-core/Makefile.core.def: Remove unnecessary extra_dist
    * grub-core/lib/posix_wrap/localcharset.h (locale_charset): Update
    header.
    * grub-core/lib/posix_wrap/langinfo.h (nl_langinfo): Return static
    string.
This commit is contained in:
Yves Blusseau 2010-09-20 12:35:33 +02:00
parent e511c9f591
commit 15c6926126
164 changed files with 28462 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Makefile.util.def
View file

@ -11,14 +11,6 @@ library = {
common_nodist = grub_script.yy.h;
common_nodist = grub_script.tab.h;
common = grub-core/gnulib/error.c;
common = grub-core/gnulib/fnmatch.c;
common = grub-core/gnulib/getdelim.c;
common = grub-core/gnulib/getline.c;
common = grub-core/gnulib/getopt1.c;
common = grub-core/gnulib/getopt.c;
common = grub-core/gnulib/progname.c;
common = util/misc.c;
common = grub-core/kern/misc.c;
common = grub-core/kern/emu/mm.c;
@ -101,6 +93,7 @@ program = {
common = util/bin2h.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
mansection = 1;
};
@ -114,6 +107,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
};
@ -125,6 +119,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -135,6 +130,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -145,6 +141,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -155,6 +152,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
};
@ -173,6 +171,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL)';
ldadd = grub-core/gnulib/libgnu.a;
condition = COND_GRUB_PE2ELF;
};
@ -184,10 +183,12 @@ program = {
common = grub-core/kern/emu/hostfs.c;
common = grub-core/disk/host.c;
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -200,6 +201,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
ldadd = '$(freetype_libs)';
condition = COND_GRUB_MKFONT;
};
@ -218,6 +220,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -228,6 +231,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = grub-core/gnulib/libgnu.a;
};
program = {
@ -242,6 +246,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = grub-core/gnulib/libgnu.a;
enable = i386_pc;
enable = sparc64_ieee1275;
@ -255,6 +260,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldadd = grub-core/gnulib/libgnu.a;
enable = sparc64_ieee1275;
};
@ -266,6 +272,7 @@ program = {
ldadd = libgrub.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};
data = {
@ -585,4 +592,5 @@ program = {
ldadd = libgrub.a;
ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldadd = grub-core/gnulib/libgnu.a;
};