include_HEADERS is a generic variable, too, so it should be appended as
well. OK to apply to HEAD?
Cheers,
Ralf
* 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.
Index: Makefile.am
===
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.177
diff -u -r1.177 Makefile.am
--- Makefile.am 7 Nov 2005 14:16:14 - 1.177
+++ Makefile.am 10 Nov 2005 19:49:36 -
@@ -36,6 +36,7 @@
MOSTLYCLEANFILES =
DISTCLEANFILES =
+include_HEADERS=
noinst_LTLIBRARIES =
lib_LTLIBRARIES=
EXTRA_LTLIBRARIES =
@@ -204,6 +205,7 @@
echo 'AM_CPPFLAGS ='; \
echo 'AM_LDFLAGS ='; \
echo 'BUILT_SOURCES ='; \
+ echo 'include_HEADERS ='; \
echo 'noinst_LTLIBRARIES ='; \
echo 'lib_LTLIBRARIES ='; \
echo 'EXTRA_LTLIBRARIES ='; \
Index: doc/libtool.texi
===
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.204
diff -u -r1.204 libtool.texi
--- doc/libtool.texi7 Nov 2005 14:35:35 - 1.204
+++ doc/libtool.texi10 Nov 2005 19:49:36 -
@@ -2259,18 +2259,19 @@
@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 @@
@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 @@
CLEANFILES =
MOSTLYCLEANFILES =
+include_HEADERS =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
EXTRA_LTLIBRARIES =
Index: libltdl/Makefile.inc
===
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- libltdl/Makefile.inc9 Nov 2005 21:38:09 - 1.2
+++ libltdl/Makefile.inc10 Nov 2005 19:49:36 -
@@ -39,7 +39,7 @@
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
Index: tests/nonrecursive.at
===
RCS file: /cvsroot/libtool/libtool/tests/nonrecursive.at,v
retrieving revision 1.2
diff -u -r1.2 nonrecursive.at
--- tests/nonrecursive.at 10 Nov 2005 14:57:50 - 1.2
+++ tests/nonrecursive.at 10 Nov 2005 19:49:38 -
@@ -43,6 +43,7 @@
AM_CPPFLAGS=
AM_LDFLAGS =
+include_HEADERS=
noinst_LTLIBRARIES =
lib_LTLIBRARIES= foo.la
EXTRA_LTLIBRARIES =