From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 14 Nov 2005 20:39:27 +0000 (+0000)
Subject: * Makefile.am, libltdl/Makefile.inc (INSTALL_LTDL):
X-Git-Tag: release-2-1b~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ddbaa343a51d7320fc2e0d54831093013a903a5;p=thirdparty%2Flibtool.git

* Makefile.am, libltdl/Makefile.inc (INSTALL_LTDL):
For nonrecursive mode, add to include_HEADERS as well.
* doc/libtool.texi (Invoking libtoolize, Distributing libltdl),
tests/nonrecursive.at: Adjusted, and removed TABS from .texi.
---

diff --git a/ChangeLog b/ChangeLog
index cf273bf0e..3d9e13cba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-14  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* Makefile.am, libltdl/Makefile.inc (INSTALL_LTDL):
+	For nonrecursive mode, add to include_HEADERS as well.
+	* doc/libtool.texi (Invoking libtoolize, Distributing libltdl),
+	tests/nonrecursive.at: Adjusted, and removed TABS from .texi.
+
 	* libtoolize.m4sh: Revert use of `$tst_aclocaldir'.
 
 2005-11-13  Eric Blake  <ebb9@byu.net>
diff --git a/Makefile.am b/Makefile.am
index c3b1930c5..42fb81a71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ CLEANFILES		=
 MOSTLYCLEANFILES	=
 DISTCLEANFILES		=
 
+include_HEADERS		=
 noinst_LTLIBRARIES	=
 lib_LTLIBRARIES		=
 EXTRA_LTLIBRARIES	=
@@ -204,6 +205,7 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
 	  echo 'AM_CPPFLAGS ='; \
 	  echo 'AM_LDFLAGS ='; \
 	  echo 'BUILT_SOURCES ='; \
+	  echo 'include_HEADERS ='; \
 	  echo 'noinst_LTLIBRARIES ='; \
 	  echo 'lib_LTLIBRARIES ='; \
 	  echo 'EXTRA_LTLIBRARIES ='; \
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 085569762..06bb9a266 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2259,18 +2259,19 @@ parent project:
 @example
 ## libltdl/Makefile.inc @r{appends to the following variables}
 ## @r{so we set them here before including it:}
-BUILT_SOURCES	   =
+BUILT_SOURCES   =
 
 AM_CPPFLAGS        =
 AM_LDFLAGS         =
 
+include_HEADERS    =
 noinst_LTLIBRARIES =
-lib_LTLIBRARIES	   =
+lib_LTLIBRARIES   =
 EXTRA_LTLIBRARIES  =
 
-EXTRA_DIST	   =
+EXTRA_DIST   =
 
-CLEANFILES	   =
+CLEANFILES   =
 MOSTLYCLEANFILES   =
 
 include libltdl/Makefile.inc
@@ -2707,7 +2708,7 @@ programs are linked against.  This convention is used especially on
 
 @example
 trick$ @kbd{ls /usr/lib/libbfd*}
-/usr/lib/libbfd.a	    /usr/lib/libbfd.so.2.7.0.2
+/usr/lib/libbfd.a           /usr/lib/libbfd.so.2.7.0.2
 /usr/lib/libbfd.so
 trick$
 @end example
@@ -4254,6 +4255,7 @@ EXTRA_DIST =
 CLEANFILES =
 MOSTLYCLEANFILES =
 
+include_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 EXTRA_LTLIBRARIES =
diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index 1965f1a0f..6d3ddf04f 100644
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -39,7 +39,7 @@ ltdlincludedir		= $(includedir)/libltdl
 ltdlinclude_HEADERS	= libltdl/libltdl/lt_system.h \
 			  libltdl/libltdl/lt_error.h \
 			  libltdl/libltdl/lt_dlloader.h
-include_HEADERS		= libltdl/ltdl.h
+include_HEADERS	       += libltdl/ltdl.h
 lib_LTLIBRARIES	       += libltdl/libltdl.la
 endif
 
diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index ea530c895..cb5e9eb4f 100644
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -43,6 +43,7 @@ BUILT_SOURCES		=
 AM_CPPFLAGS		=
 AM_LDFLAGS		=
 
+include_HEADERS		=
 noinst_LTLIBRARIES	=
 lib_LTLIBRARIES		= foo.la
 EXTRA_LTLIBRARIES	=