Fix distfiles list.

	Reported by: Andrey Borzenkov <arvidjaar@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index bbaed8412d3d7b088ee800c2446bc5d6f104355f..9b9630376952c28bfe3dc0079f451d4dd474edf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2013-05-11  Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+2013-05-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix distfiles list.
+       Reported by: Andrey Borzenkov <arvidjaar@gmail.com>
+
+2013-05-11  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
 
        * grub-core/net/bootp.c (grub_cmd_bootp): Check if there is any card
        present.

diff --git a/Makefile.am b/Makefile.am
index 9889023e1ef6df94bb7943b018d33f772f9db2a4..9ebe7a874b248193c2d75762363cd00ebc988540 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,7 +376,7 @@ if COND_powerpc_ieee1275
 BOOTCHECKS = bootcheck-linux-ppc
 endif
 
-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-mips.S grub-core/tests/boot/linux.init-ppc.S grub-core/tests/boot/linux.init-x86_64.S grub-core/tests/boot/linux-ppc.cfg 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
+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-mips.S grub-core/tests/boot/linux.init-ppc.S grub-core/tests/boot/linux.init-x86_64.S grub-core/tests/boot/linux-ppc.cfg 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 grub-core/tests/boot/qemu-shutdown-x86.S
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
        bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \

diff --git a/Makefile.util.def b/Makefile.util.def
index dc621db20c941d08b6cc71d933ca7de0dc4cc194..6cc15cbf2fafc53f904e6c001e680015000fa118 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -550,6 +550,7 @@ script = {
   testcase;
   name = gettext_strings_test;
   common = tests/gettext_strings_test.in;
+  extra_dist = po/exclude.pot;
 };
 
 script = {

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 2e365008ffbe118dd6f5d823e07db71e465230aa..dc788a151b051350529f6ff30452ab7cd2727f44 100644 (file)
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -26,17 +26,18 @@ EXTRA_DIST += grub-core/gensymlist.sh
 EXTRA_DIST += grub-core/genemuinit.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher
+EXTRA_DIST += grub-core/lib/libgcrypt
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
 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 += grub-core/efiemu/runtime/config.h
-EXTRA_DIST += grub-core/lib/libgcrypt/src/gcrypt.h.in
 
 EXTRA_DIST += grub-core/lib/LzmaDec.c
 
 EXTRA_DIST += BUGS
 EXTRA_DIST += util/i386/efi/grub-dumpdevtree
+EXTRA_DIST += util/spkmodem-recv.c
 EXTRA_DIST += util/import_gcrypth.sed
 
 EXTRA_DIST += m4/gnulib-cache.m4
@@ -53,3 +54,4 @@ EXTRA_DIST += m4/printf-posix.m4
 EXTRA_DIST += m4/threadlib.m4
 EXTRA_DIST += m4/uintmax_t.m4
 EXTRA_DIST += m4/visibility.m4
+EXTRA_DIST += m4/math_h.m4

diff --git a/gentpl.py b/gentpl.py
index 8674622f1ae9e7b83ac0308f8fd035b977595d9e..22a8b0e34942cb05d1d4a83f86d2e67172ce5d16 100644 (file)
--- a/gentpl.py
+++ b/gentpl.py
@@ -541,6 +541,7 @@ chmod a+x [+ name +]
 """)
 
     r += gvar_add("CLEANFILES", "[+ name +]")
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("dist_noinst_DATA", platform_sources(platform))
     return r
 

diff --git a/util/import_gcry.py b/util/import_gcry.py
index afa8e697e93299e925314fc1d2deeb8409f02de2..342cba3a6e23d0f36866f5ce63ad95d5ef7892cd 100644 (file)
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -473,7 +473,17 @@ for cipher_file in cipher_files:
 cryptolist.close ()
 
 for src in sorted (os.listdir (os.path.join (indir, "src"))):
-    if src == "versioninfo.rc.in":
+    if src == "versioninfo.rc.in" or src == "ath.c" or src == "ChangeLog-2011" \
+            or src == "dumpsexp.c" or src == "fips.c" or src == "gcrypt.h.in" \
+            or src == "gcryptrnd.c"or src == "getrandom.c" \
+            or src == "global.c" or src == "hmac256.c" \
+            or src == "hwfeatures.c" or src == "libgcrypt-config.in" \
+            or src == "libgcrypt.def" or src == "libgcrypt.m4" \
+            or src == "libgcrypt.vers" or src == "Makefile.am" \
+            or src == "Manifest" or src == "misc.c" \
+            or src == "missing-string.c" or src == "module.c" \
+            or src == "secmem.c" or src == "sexp.c" \
+            or src == "stdmem.c" or src == "visibility.c":
         continue
     outfile = os.path.join (basedir, "src", src)
     infile = os.path.join (indir, "src", src)
@@ -499,6 +509,10 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
     fw.close ()
 
 for src in sorted (os.listdir (os.path.join (indir, "mpi"))):
+    if src == "config.links" or src == "ChangeLog-2011" \
+            or src == "mpi-scan.c" or src == "Manifest" \
+            or src == "Makefile.am":
+        continue
     infile = os.path.join (indir, "mpi", src)
     outfile = os.path.join (basedir, "mpi", src)
     if os.path.isdir (infile):