In the subpackage case, we do not install Makefile.inc. Since

we have to be correct for this case, remove `Makefile.inc' from
EXTRA_DIST.  Recursive mode does not use it either.  Since
nonrecursive mode requires an Automake >= 1.7 anyway, and those
versions automatically distribute included makefile fragments,
we don't need to cater for that one either.

* libltdl/Makefile.inc (EXTRA_DIST): Remove Makefile.inc.
Reorder other entries.

diff --git a/ChangeLog b/ChangeLog
index 5251db87bb04d6887124b1f73348cad19593cce2..10e41d320c4cf15d8fcf3ace399a88aabdfd5937 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,22 @@
+2005-12-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       In the subpackage case, we do not install Makefile.inc.  Since
+       we have to be correct for this case, remove `Makefile.inc' from
+       EXTRA_DIST.  Recursive mode does not use it either.  Since
+       nonrecursive mode requires an Automake >= 1.7 anyway, and those
+       versions automatically distribute included makefile fragments,
+       we don't need to cater for that one either.
+
+       * libltdl/Makefile.inc (EXTRA_DIST): Remove Makefile.inc.
+       Reorder other entries.
+
 2005-12-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * Makefile.am (libltdl/Makefile.in): also depend on
        libltdl/aclocal.m4, so that we guarantee timestamp consistency.
        (libltdl/stamp-mk): New target, to fix `libltdl/Makefile.in'.
-       (EXTRA_DIST): Distribute `libltdl/stamp-mk'.
+       (EXTRA_DIST): Distribute `libltdl/stamp-mk' and
+       `libltdl/m4/lt~obsolete.m4'.
        (all-local): Ensure the stamp files is up to date.
        (libltdl/aclocal.m4): New target, to ensure timestamp
        consistency.  Depend on all m4 files.

diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index 9c61e70aac326e3c0da667f50bd51fff46e618de..5dd221cef27d521174dbf0e70a2e22d9e0c2615f 100644 (file)
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -117,15 +117,13 @@ CLEANFILES                       += libltdl/libltdl.la \
 CLEANFILES            += $(LIBOBJS) $(LTLIBOBJS)
 
 EXTRA_DIST            += libltdl/COPYING.LIB \
+                         libltdl/configure.ac \
                          libltdl/Makefile.am \
+                         libltdl/aclocal.m4 \
                          libltdl/Makefile.in \
-                         libltdl/Makefile.inc \
-                         libltdl/README \
-                         libltdl/config-h.in \
                          libltdl/configure \
-                         libltdl/configure.ac \
-                         libltdl/aclocal.m4 \
-                         libltdl/m4/lt~obsolete.m4
+                         libltdl/config-h.in \
+                         libltdl/README
 
 ## --------------------------- ##
 ## Gnulib Makefile.am snippets ##