From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 16 Dec 2005 16:36:20 +0000 (+0000)
Subject: In the subpackage case, we do not install Makefile.inc.  Since
X-Git-Tag: release-2-1b~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12694863894a0789b7e71d734b2db252d9c0006d;p=thirdparty%2Flibtool.git

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 5251db87b..10e41d320 100644
--- 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 9c61e70aa..5dd221cef 100644
--- 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 ##