From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 23 Nov 2004 16:08:56 +0000 (+0000)
Subject: The ltdl.h header is the published interface to libltdl, and
X-Git-Tag: release-2-1b~844
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11eb79b68924d96d584981666e93ec5836a1dd06;p=thirdparty%2Flibtool.git

The ltdl.h header is the published interface to libltdl, and
is thus not installed to $prefix/include/libltdl.  It has always
been used with `#include <ltdl.h>', so move just that one file
back to where it was before:

* libltdl/libltdl/ltdl.h: Moved from here...
* libltdl/ltdl.h: ...to here.
* libltdl/Makefile.am: Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index 152d4e432..818d3df04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2004-11-23  Gary V. Vaughan  <gary@gnu.org>
+
+	The ltdl.h header is the published interface to libltdl, and
+	is thus not installed to $prefix/include/libltdl.  It has always
+	been used with `#include <ltdl.h>', so move just that one file
+	back to where it was before:
+
+	* libltdl/libltdl/ltdl.h: Moved from here...
+	* libltdl/ltdl.h: ...to here.
+	* libltdl/Makefile.am: Adjust.
+
 2004-11-23  Peter O'Gorman  <peter@pogma.com>
 
-	Do not require that libtoolize --ltdl=/some/path end in libltdl. Move
-	most libltdl headers to libtldl/libltdl to allow 
-	#include <libltdl/ltdl.h> to always work.
+	Do not require that libtoolize --ltdl=/some/path end in libltdl.
+	Move most libltdl headers to libtldl/libltdl to allow 
+	`#include <libltdl/ltdl.h>' to always work:
 
 	* libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes
 	in the new location.
@@ -16,7 +27,7 @@
 	libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
 	to libltdl/libltdl.
 
-2004-11-23  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+2004-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* doc/libtool.texi (LT_INIT): s/libtool 1.6/libtool 2.0/.
 	(Invoking libtoolize): Fix typo.
@@ -30,7 +41,7 @@
 	* doc/libtool.texi (Invoking libtoolize): Improve documentation
 	for use of ACLOCAL_AMFLAGS and AC_CONFIG_MACRO_DIR.
 
-2004-11-22  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+2004-11-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* m4/libtool.m4 (_LT_TAG_COMPILER): Document that with_gcc is
 	tag-dependent.
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index b1f626646..f42e4ff81 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -45,7 +45,7 @@ libdlloader_la_LIBADD	= $(LTLIBOBJS)
 
 ## Libltdl brings it all together:
 if INSTALL_LTDL
-include_HEADERS		= libltdl/ltdl.h
+include_HEADERS		= ltdl.h
 pkginclude_HEADERS	= libltdl/lt_system.h libltdl/lt_error.h \
 			  libltdl/lt_dlloader.h
 lib_LTLIBRARIES		+= libltdl.la
@@ -55,7 +55,7 @@ if CONVENIENCE_LTDL
 noinst_LTLIBRARIES	= libltdlc.la
 endif
 
-libltdl_la_SOURCES	= libltdl/ltdl.h ltdl.c \
+libltdl_la_SOURCES	= ltdl.h ltdl.c \
 			  libltdl/lt_dlloader.h lt_dlloader.c loaders/preopen.c
 libltdl_la_CPPFLAGS	= -DLTDLOPEN=libltdl $(AM_CPPFLAGS)
 libltdl_la_LDFLAGS	=  $(VERSION_INFO) $(LT_DLPREOPEN)