Fix make dist.

	* Makefile.am (starfield_theme_files): New var.
	(starfield_DATA): Use starfield_theme_files.
	(EXTRA_DIST): Add starfield_theme_files. Add starfield source files.
	Add bootcheck-related files.
	* conf/Makefile.extra-dist (EXTRA_DIST): Add several missing files.
	* docs/Makefile.am (EXTRA_DIST): Add font_char_metrics.png
	and font_char_metrics.txt.
	* grub-core/Makefile.core.def (kernel): Update extra_dist.
	(setjmp): Add lib/ia64/longjmp.S.
	* po/Makefile.in.in (DISTFILES): Add POTFILES-shell.in and grub.d.sed.
	* po/POTFILES.in: Regenerate.
	* po/Rules-swiss: use DISTFILES.common.extra2 and not
	DISTFILES.common.extra1.
	* util/devicemap.c: Removed.
	* grub-core/lib/i386/relocator_backward.S: Likewise.
	* util/import_gcry.py: Remove unused files. Add extra_dist for
	ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index eb292b60aaa4411d744bdabb6994c59c87626eb1..06c93425518e4e6116e9c8d30246ba6983016b0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2012-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix make dist.
+
+       * Makefile.am (starfield_theme_files): New var.
+       (starfield_DATA): Use starfield_theme_files.
+       (EXTRA_DIST): Add starfield_theme_files. Add starfield source files.
+       Add bootcheck-related files.
+       * conf/Makefile.extra-dist (EXTRA_DIST): Add several missing files.
+       * docs/Makefile.am (EXTRA_DIST): Add font_char_metrics.png
+       and font_char_metrics.txt.
+       * grub-core/Makefile.core.def (kernel): Update extra_dist.
+       (setjmp): Add lib/ia64/longjmp.S.
+       * po/Makefile.in.in (DISTFILES): Add POTFILES-shell.in and grub.d.sed.
+       * po/POTFILES.in: Regenerate.
+       * po/Rules-swiss: use DISTFILES.common.extra2 and not
+       DISTFILES.common.extra1.
+       * util/devicemap.c: Removed.
+       * grub-core/lib/i386/relocator_backward.S: Likewise.
+       * util/import_gcry.py: Remove unused files. Add extra_dist for
+       ChangeLog.
+
 2012-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/gettext/gettext.c (grub_mofile_open): Call

diff --git a/Makefile.am b/Makefile.am
index dca92c57debc867ffdf778bff5e38745785df839..42c34581d9bca2c6cfe323e89fbd07638c532947 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,14 +66,19 @@ pkgdata_DATA += unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
 endif
 endif
 
+starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
+
 if COND_STARFIELD
-starfield_DATA = dejavu.pf2 $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt
+starfield_DATA = dejavu.pf2 $(starfield_theme_files)
 dejavu.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
        $(builddir)/grub-mkfont -o $@ $(DJVU_FONT_SOURCE)
 else
 starfield_DATA = 
 endif
 
+EXTRA_DIST += $(starfield_theme_files)
+EXTRA_DIST += $(srcdir)/themes/starfield/src/slider_s.xcf $(srcdir)/themes/starfield/src/slider_n.xcf $(srcdir)/themes/starfield/src/slider_c.xcf $(srcdir)/themes/starfield/src/blob_nw.xcf $(srcdir)/themes/starfield/src/bootmenu/center.xcf $(srcdir)/themes/starfield/src/bootmenu/corner.xcf $(srcdir)/themes/starfield/src/bootmenu/side.xcf $(srcdir)/themes/starfield/src/terminalbox/side.xcf $(srcdir)/themes/starfield/src/terminalbox/corner.xcf $(srcdir)/themes/starfield/src/terminalbox/center.xcf
+
 unicode.pf2: $(FONT_SOURCE) grub-mkfont
        $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
 CLEANFILES += unicode.pf2
@@ -318,6 +323,7 @@ BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
 
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64
 
+EXTRA_DIST += grub-core/tests/boot/kbsd.init-i386.S grub-core/tests/boot/kbsd.init-x86_64.S grub-core/tests/boot/kbsd.spec.txt grub-core/tests/boot/kernel-8086.S grub-core/tests/boot/kernel-i386.S grub-core/tests/boot/kfreebsd-aout.cfg grub-core/tests/boot/kfreebsd.cfg grub-core/tests/boot/kfreebsd.init-i386.S grub-core/tests/boot/kfreebsd.init-x86_64.S grub-core/tests/boot/knetbsd.cfg grub-core/tests/boot/kopenbsd.cfg grub-core/tests/boot/kopenbsdlabel.txt grub-core/tests/boot/linux16.cfg grub-core/tests/boot/linux.cfg grub-core/tests/boot/linux.init-i386.S grub-core/tests/boot/linux.init-x86_64.S grub-core/tests/boot/multiboot2.cfg grub-core/tests/boot/multiboot.cfg grub-core/tests/boot/ntldr.cfg grub-core/tests/boot/pc-chainloader.cfg
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
        bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index c340bb80e139632f0256760d33eebb5f7e766b1d..c862206bc79c263615182285a59084dcb81fbf49 100644 (file)
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -4,6 +4,7 @@ EXTRA_DIST += geninit.sh
 EXTRA_DIST += gentpl.py
 EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
+EXTRA_DIST += Makefile.utilgcry.def
 
 EXTRA_DIST += unicode
 
@@ -29,6 +30,24 @@ EXTRA_DIST += grub-core/lib/libgcrypt/cipher
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
-EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
+EXTRA_DIST += grub-core/efiemu/runtime/config.h
+
+EXTRA_DIST += grub-core/lib/LzmaDec.c
+
+EXTRA_DIST += BUGS
+EXTRA_DIST += util/i386/efi/grub-dumpdevtree
 
 EXTRA_DIST += m4/gnulib-cache.m4
+EXTRA_DIST += m4/glibc2.m4
+EXTRA_DIST += m4/gnulib-tool.m4
+EXTRA_DIST += m4/intdiv0.m4
+EXTRA_DIST += m4/intl.m4
+EXTRA_DIST += m4/intldir.m4
+EXTRA_DIST += m4/intmax.m4
+EXTRA_DIST += m4/inttypes-pri.m4
+EXTRA_DIST += m4/lcmessage.m4
+EXTRA_DIST += m4/lock.m4
+EXTRA_DIST += m4/printf-posix.m4
+EXTRA_DIST += m4/threadlib.m4
+EXTRA_DIST += m4/uintmax_t.m4
+EXTRA_DIST += m4/visibility.m4

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6e150060114e335d99fac6b59d50d72f46e8ab88..93eb3962765296f35c7a07827be72b7ca5efb0ef 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,4 +4,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 info_TEXINFOS = grub.texi grub-dev.texi
 grub_TEXINFOS = fdl.texi
 
+EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
+
 

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 225a273ee54f889753adbc068776026f22602fca..947a43ab3e61c7e8205157a43aa31adf2f4c7460 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -194,6 +194,7 @@ kernel = {
   mips_loongson = video/sis315pro.c;
   mips_loongson = video/radeon_fuloong2e.c;
   extra_dist = video/sm712_init.c;
+  extra_dist = video/sis315_init.c;
   mips_loongson = commands/keylayouts.c;
 
   powerpc_ieee1275 = kern/powerpc/cache.S;
@@ -234,7 +235,7 @@ kernel = {
 
   extra_dist = kern/i386/int.S;
   extra_dist = kern/i386/realmode.S;
-  extra_dist = kern/i386/pc/lzma_decode.S;
+  extra_dist = boot/i386/pc/lzma_decode.S;
   extra_dist = kern/mips/cache_flush.S;
 };
 
@@ -1286,6 +1287,7 @@ module = {
   extra_dist = lib/sparc64/setjmp.S;
   extra_dist = lib/powerpc/setjmp.S;
   extra_dist = lib/ia64/setjmp.S;
+  extra_dist = lib/ia64/longjmp.S;
 };
 
 module = {

diff --git a/grub-core/lib/i386/relocator_backward.S b/grub-core/lib/i386/relocator_backward.S
deleted file mode 100644 (file)
index 0691347..0000000
--- a/grub-core/lib/i386/relocator_backward.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define BACKWARD
-#include "relocator_asm.S"

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5a7c07c5bae6b59842e7c0e110ab9edb9322c68a..57b3ae425a64ffc175b0de1a6e716ab702df9bb6 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -68,9 +68,9 @@ UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in POTFILES-shell.in \
 $(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) grub.d.sed README
 
 POTFILES = \
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 55fec0cc5fec7c29f5100ac12073384a3f3d39d6..7961d90bb963120811cfbddd693f42fe439f2271 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -521,7 +521,6 @@
 ./tests/lib/unit_test.c
 ./tests/printf_unit_test.c
 ./util/bin2h.c
-./util/devicemap.c
 ./util/getroot.c
 ./util/grub-editenv.c
 ./util/grub-fstest.c

diff --git a/po/Rules-swiss b/po/Rules-swiss
index 1f98ac1f9aedb872b61dbbded6eb5075fae99482..2293d3b95fd523ae0e2a2bc262ebea62022cdb32 100644 (file)
--- a/po/Rules-swiss
+++ b/po/Rules-swiss
@@ -1,6 +1,6 @@
 # Special Makefile rules for English message catalogs with quotation marks.
 
-DISTFILES.common.extra1 = swiss.sed Rules-swiss
+DISTFILES.common.extra2 = swiss.sed Rules-swiss
 
 de_CH.po-create: de.po swiss.sed
        LC_ALL=C.UTF-8 $(MSGFILTER) -i $< -o $(srcdir)/de_CH.po sed -f $(srcdir)/swiss.sed

diff --git a/util/devicemap.c b/util/devicemap.c
deleted file mode 100644 (file)
index c618644..0000000
--- a/util/devicemap.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-#include <grub/util/deviceiter.h>
-
-void
-grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy,
-                               int *num_fd, int *num_hd)
-{
-    if (is_floppy)
-      fprintf (fp, "(fd%d)\t%s\n", (*num_fd)++, name);
-    else
-      fprintf (fp, "(hd%d)\t%s\n", (*num_hd)++, name);
-}

diff --git a/util/import_gcry.py b/util/import_gcry.py
index 3493361d74234869a54a3117cd30e95c767cdcad..18966a6d6fceaa9b78ed04b49cbf038ca9170281 100644 (file)
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -49,6 +49,7 @@ confutil.write ("library = {\n");
 confutil.write ("  name = libgrubgcry.a;\n");
 confutil.write ("  cflags = '$(CFLAGS_GCRY)';\n");
 confutil.write ("  cppflags = '$(CPPFLAGS_GCRY)';\n");
+confutil.write ("  extra_dist = grub-core/lib/libgcrypt-grub/cipher/ChangeLog;\n");
 confutil.write ("\n");
 chlog = ""
 modules = []
@@ -330,12 +331,16 @@ for cipher_file in cipher_files:
                 conf.write ("  cflags = '$(CFLAGS_GCRY)';\n");
             conf.write ("  cppflags = '$(CPPFLAGS_GCRY)';\n");
             conf.write ("};\n\n")
+            f.close ()
+            fw.close ()
+            if nch:
+                chlog = "%s%s\n" % (chlog, chlognew)
         elif isc and cipher_file != "camellia.c":
             print ("WARNING: C file isn't a module: %s" % cipher_file)
-        f.close ()
-        fw.close ()
-        if nch:
-            chlog = "%s%s\n" % (chlog, chlognew)
+            f.close ()
+            fw.close ()
+            os.remove (outfile)
+            chlog = "%s\n      * %s: Removed" % (chlog, cipher_file)
         continue
     chlog = "%s%sSkipped unknown file\n" % (chlog, chlognew)
     print ("WARNING: unknown file %s" % cipher_file)