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.
* libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h,
libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h,
libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h,
libltdl/libltdl/lt_system.h, libltdl/libltdl/ltdl.h,
libltdl/libltdl/slist.h: Added files, moved from libtdl/.
* libltdl/lt__alloc.h, libltdl/lt__dirent.h, libltdl/lt__glibc.h,
libltdl/lt__private.h, libltdl/lt_dlloader.h, libltdl/lt_error.h,
libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
to libltdl/libltdl.

diff --git a/ChangeLog b/ChangeLog
index c868db96c005f7c9530f04b6d0a75f4570601bfa..152d4e432c025665da8bef8680cb44cc551564e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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.
+
+       * libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes
+       in the new location.
+       * libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h, 
+       libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h,
+       libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h,
+       libltdl/libltdl/lt_system.h, libltdl/libltdl/ltdl.h,
+       libltdl/libltdl/slist.h: Added files, moved from libtdl/.
+       * libltdl/lt__alloc.h, libltdl/lt__dirent.h, libltdl/lt__glibc.h,
+       libltdl/lt__private.h, libltdl/lt_dlloader.h, libltdl/lt_error.h,
+       libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
+       to libltdl/libltdl.
+
 2004-11-23  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * doc/libtool.texi (LT_INIT): s/libtool 1.6/libtool 2.0/.

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index ad9e0b0cbb3b9fb37af6a4ca4595600d9ec34416..b1f626646297d8b89a0bb90b2ec9f224cf50728d 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -27,26 +27,27 @@ AUTOMAKE_OPTIONS    = foreign
 ACLOCAL_AMFLAGS                = -I m4
 
 DEFS                   = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS            = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS            = -I$(builddir) -I$(srcdir) -I$(srcdir)/libltdl
 AM_LDFLAGS             = -no-undefined
 VERSION_INFO           = -version-info 6:0:0
 
 pkgincludedir          = $(includedir)/libltdl
 
 lib_LTLIBRARIES                = libdlloader.la
-libdlloader_la_SOURCES  = lt_error.h lt_error.c \
-                         lt__private.h lt_system.h \
-                         lt__alloc.h lt__alloc.c \
-                         lt__glibc.h \
-                         lt__dirent.h \
-                         slist.h slist.c
+libdlloader_la_SOURCES  = libltdl/lt_error.h lt_error.c \
+                         libltdl/lt__private.h libltdl/lt_system.h \
+                         libltdl/lt__alloc.h lt__alloc.c \
+                         libltdl/lt__glibc.h \
+                         libltdl/lt__dirent.h \
+                         libltdl/slist.h slist.c
 libdlloader_la_LDFLAGS = $(VERSION_INFO)
 libdlloader_la_LIBADD  = $(LTLIBOBJS)
 
 ## Libltdl brings it all together:
 if INSTALL_LTDL
-include_HEADERS                = ltdl.h
-pkginclude_HEADERS     = lt_system.h lt_error.h lt_dlloader.h
+include_HEADERS                = libltdl/ltdl.h
+pkginclude_HEADERS     = libltdl/lt_system.h libltdl/lt_error.h \
+                         libltdl/lt_dlloader.h
 lib_LTLIBRARIES                += libltdl.la
 endif
 
@@ -54,8 +55,8 @@ if CONVENIENCE_LTDL
 noinst_LTLIBRARIES     = libltdlc.la
 endif
 
-libltdl_la_SOURCES     = ltdl.h ltdl.c \
-                         lt_dlloader.h lt_dlloader.c loaders/preopen.c
+libltdl_la_SOURCES     = libltdl/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)
 libltdl_la_LIBADD      = libdlloader.la
@@ -70,7 +71,8 @@ libltdlc_la_LIBADD    = $(libdlloader_la_LIBADD)
 ltdldatadir            = $(pkgvdatadir)/libltdl
 nobase_ltdldata_DATA   = COPYING.LIB Makefile.am README configure.ac \
                          $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \
-                         lt__dirent.c lt__dirent.h argz_.h argz.c
+                         lt__dirent.c libltdl/lt__dirent.h \
+                         argz_.h argz.c
 
 ## Make sure these will be cleaned even when they're not built by default:
 CLEANFILES             = libltdl.la libltdlc.la libdlloader.la

diff --git a/libltdl/lt__alloc.h b/libltdl/libltdl/lt__alloc.h
similarity index 100%
rename from libltdl/lt__alloc.h
rename to libltdl/libltdl/lt__alloc.h

diff --git a/libltdl/lt__dirent.h b/libltdl/libltdl/lt__dirent.h
similarity index 100%
rename from libltdl/lt__dirent.h
rename to libltdl/libltdl/lt__dirent.h

diff --git a/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
similarity index 100%
rename from libltdl/lt__glibc.h
rename to libltdl/libltdl/lt__glibc.h

diff --git a/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
similarity index 100%
rename from libltdl/lt__private.h
rename to libltdl/libltdl/lt__private.h

diff --git a/libltdl/lt_dlloader.h b/libltdl/libltdl/lt_dlloader.h
similarity index 100%
rename from libltdl/lt_dlloader.h
rename to libltdl/libltdl/lt_dlloader.h

diff --git a/libltdl/lt_error.h b/libltdl/libltdl/lt_error.h
similarity index 100%
rename from libltdl/lt_error.h
rename to libltdl/libltdl/lt_error.h

diff --git a/libltdl/lt_system.h b/libltdl/libltdl/lt_system.h
similarity index 100%
rename from libltdl/lt_system.h
rename to libltdl/libltdl/lt_system.h

diff --git a/libltdl/ltdl.h b/libltdl/libltdl/ltdl.h
similarity index 100%
rename from libltdl/ltdl.h
rename to libltdl/libltdl/ltdl.h

diff --git a/libltdl/slist.h b/libltdl/libltdl/slist.h
similarity index 100%
rename from libltdl/slist.h
rename to libltdl/libltdl/slist.h

diff --git a/libltdl/loaders/Makefile.am b/libltdl/loaders/Makefile.am
index aded080fa2e717586e10ff4225c0a4f04db04484..e17443000e0309364f4ae667aa8097443f2b6cf5 100644 (file)
--- a/libltdl/loaders/Makefile.am
+++ b/libltdl/loaders/Makefile.am
@@ -24,8 +24,8 @@ EXTRA_DIST            =
 AUTOMAKE_OPTIONS       = foreign
 
 DEFS                   = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS            = -I$(top_builddir) -I$(top_srcdir) \
-                         -I.. -I$(srcdir)/..
+AM_CPPFLAGS            = -I$(top_builddir) -I$(top_srcdir)  \
+                         -I.. -I$(srcdir)/.. -I$(srcdir)/../libltdl
 AM_LDFLAGS             = -no-undefined -module -avoid-version -export-dynamic
 
 pkgincludedir          = $(includedir)/libltdl