distcheck almost done

diff --git a/Makefile.am b/Makefile.am
index 4063a64762818781608c4230d675ec292ff7e1d6..09c2fa43e293654e1282fa619084a2b43ac1ee3a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
+EXTRA_DIST += include conf/i386-pc-cygwin-img-ld.sc
 
 grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)

diff --git a/configure.ac b/configure.ac
index ee01049ac86f180a07769032b66648dd63bb4075..23988a17e6dd39fb781880fc2101482d13d103e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -867,8 +867,6 @@ AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
-  mkdir -p grub-core/lib
-  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu
   if test "$platform" != emu ; then
     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
   fi
@@ -883,6 +881,13 @@ else
   fi
 fi
 
+# Copy */setjmp.S to target_cpu/
+AC_CONFIG_COMMANDS([grub-core/lib/target_cpu],
+  [mkdir -p grub-core/lib/target_cpu])
+AC_CONFIG_COMMANDS([setjmp.S],
+  [cp -rp $srcdir/grub-core/lib/$target_cpu/setjmp.S grub-core/lib/target_cpu/],
+  [target_cpu=$target_cpu srcdir=$srcdir])
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1b302d26274e646a56ae53b05694b040c99b7cc2..a2e83dcd64f30e0a832f341dc80c6069afd3d3d7 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+EXTRA_DIST = grub.cfg man
+
 AM_MAKEINFOFLAGS = --force --no-split --no-validate
 info_TEXINFOS = grub.texi
 grub_TEXINFOS = fdl.texi
 
+

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 0f7886b3a694a46531988e96e60ab27c6e20a01d..efce4d22ebbfefd0804c5649bef011663d11bc7d 100644 (file)
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -4,12 +4,55 @@ CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
 
-EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
+EXTRA_DIST =
+EXTRA_DIST += modules.def genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
 EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
-EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
-EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
+EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
+EXTRA_DIST += lib/libgcrypt/cipher/rijndael-tables.h
+EXTRA_DIST += lib/libgcrypt/cipher/bithelp.h
+EXTRA_DIST += lib/libgcrypt/cipher/rmd.h
+EXTRA_DIST += lib/libgcrypt/cipher/hash-common.h
+EXTRA_DIST += lib/libgcrypt/cipher/camellia.h
+EXTRA_DIST += lib/posix_wrap/localcharset.h
+EXTRA_DIST += lib/posix_wrap/ctype.h
+EXTRA_DIST += lib/posix_wrap/limits.h
+EXTRA_DIST += lib/posix_wrap/stdio.h
+EXTRA_DIST += lib/posix_wrap/sys/types.h
+EXTRA_DIST += lib/posix_wrap/unistd.h
+EXTRA_DIST += lib/posix_wrap/locale.h
+EXTRA_DIST += lib/posix_wrap/wchar.h
+EXTRA_DIST += lib/posix_wrap/string.h
+EXTRA_DIST += lib/posix_wrap/langinfo.h
+EXTRA_DIST += lib/posix_wrap/wctype.h
+EXTRA_DIST += lib/posix_wrap/stdint.h
+EXTRA_DIST += lib/posix_wrap/stdlib.h
+EXTRA_DIST += lib/posix_wrap/assert.h
+EXTRA_DIST += lib/posix_wrap/errno.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/types.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/cipher.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/rijndael-tables.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/memory.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/bithelp.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/g10lib.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/rmd.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/hash-common.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/camellia.h
+EXTRA_DIST += efiemu/runtime/config.h
+EXTRA_DIST += gnulib/getopt.h
+EXTRA_DIST += gnulib/argp-version-etc.h
+EXTRA_DIST += gnulib/fnmatch.h
+EXTRA_DIST += gnulib/error.h
+EXTRA_DIST += gnulib/argp-namefrob.h
+EXTRA_DIST += gnulib/argp.h
+EXTRA_DIST += gnulib/argp-fmtstream.h
+EXTRA_DIST += gnulib/gettext.h
+EXTRA_DIST += gnulib/regex_internal.h
+EXTRA_DIST += gnulib/progname.h
+EXTRA_DIST += gnulib/regex.h
+EXTRA_DIST += gnulib/alloca.h
+EXTRA_DIST += gnulib/getopt_int.h
 
 grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)

diff --git a/grub-core/modules.def b/grub-core/modules.def
index 8e65f277ca8121eef95168beb39f2383e0ae8ad2..3d222dd74495e09100350c870473b263cdbd4dd8 100644 (file)
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -1207,7 +1207,12 @@ module = {
 
 module = {
   name = setjmp;
-  source = lib/target_cpu/setjmp.S;
+  nodist = lib/target_cpu/setjmp.S;
+  extra_dist = lib/i386/setjmp.S;
+  extra_dist = lib/mips/setjmp.S;
+  extra_dist = lib/x86_64/setjmp.S;
+  extra_dist = lib/sparc64/setjmp.S;
+  extra_dist = lib/powerpc/setjmp.S;
 };
 
 module = {