-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
* looking for [EMAIL PROTECTED]/libtool--devo--1.0--patch-216 to compare with
* comparing to [EMAIL PROTECTED]/libtool--devo--1.0--patch-216
M libltdl/Makefile.am
M ChangeLog
* modified files
Index: Changelog
from Gary V. Vaughan <[EMAIL PROTECTED]>
* libltdl/Makefile.am: revert mistaken commit.
--- orig/libltdl/Makefile.am
+++ mod/libltdl/Makefile.am
@@ -1,17 +1,13 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+## Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
+## Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
-## As a special exception to the GNU Lesser General Public License,
-## if you distribute this file as part of a program or library that
-## is built using GNU libtool, you may include it under the same
-## distribution terms that you use for the rest of that program.
-##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -21,28 +17,25 @@
## along with this program; see the file COPYING. If not, write to
## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301, USA.
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-BUILT_SOURCES =
-EXTRA_DIST =
-CLEANFILES =
-MOSTLYCLEANFILES =
-# ### BEGIN Makefile.am
+
+BUILT_SOURCES =
+MOSTLYCLEANFILES =
+EXTRA_DIST = configure.ac
+
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS = -I. -Ilibltdl -I$(srcdir)/libltdl \
- -I$(srcdir)/libltdl
+AM_CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/libltdl
AM_LDFLAGS = -no-undefined
VERSION_INFO = -version-info 6:0:0
noinst_LTLIBRARIES = $(LT_DLLOADERS)
if INSTALL_LTDL
-ltdlincludedir = $(includedir)/libltdl
-ltdlinclude_HEADERS = libltdl/lt_system.h \
- libltdl/lt_error.h \
+nobase_include_HEADERS = ltdl.h \
+ libltdl/lt_system.h libltdl/lt_error.h \
libltdl/lt_dlloader.h
-include_HEADERS = ltdl.h
lib_LTLIBRARIES = libltdl.la
endif
@@ -50,30 +43,30 @@
noinst_LTLIBRARIES += libltdlc.la
endif
-libltdl_la_SOURCES = libltdl/lt__alloc.h \
+## !!NOTE!! Be sure to update ../Makefile.am:ltdldatafiles if you
+## make any changes here:
+libltdl_la_SOURCES = libltdl/lt__alloc.h \
libltdl/lt__dirent.h \
libltdl/lt__glibc.h \
libltdl/lt__private.h \
- libltdl/lt__strl.h \
+ libltdl/lt__strl.h \
libltdl/lt_dlloader.h \
libltdl/lt_error.h \
- libltdl/lt_system.h \
+ libltdl/lt_system.h \
libltdl/slist.h \
loaders/preopen.c \
lt__alloc.c \
lt_dlloader.c \
lt_error.c \
- ltdl.c \
- ltdl.h \
+ ltdl.c ltdl.h \
slist.c
-
-libltdl_la_CPPFLAGS = -DLTDLOPEN=libltdl $(AM_CPPFLAGS)
+libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)
libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) $(LT_DLPREOPEN)
libltdl_la_LIBADD = $(LTLIBOBJS)
-libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS)
+libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS) $(BUILT_SOURCES)
libltdlc_la_SOURCES = $(libltdl_la_SOURCES)
-libltdlc_la_CPPFLAGS = -DLTDLOPEN=libltdlc $(AM_CPPFLAGS)
+libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS)
libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN)
libltdlc_la_LIBADD = $(libltdl_la_LIBADD)
libltdlc_la_DEPENDENCIES= $(libltdl_la_DEPENDENCIES)
@@ -82,12 +75,8 @@
## pic-objects (either as a shared library, or a convenience library),
## so the loaders themselves must be made from pic-objects too. We
## use convenience libraries for that purpose:
-EXTRA_LTLIBRARIES = dlopen.la \
- dld_link.la \
- dyld.la \
- load_add_on.la \
- loadlibrary.la \
- shl_load.la
+EXTRA_LTLIBRARIES = dlopen.la dld_link.la dyld.la load_add_on.la \
+ loadlibrary.la shl_load.la
dlopen_la_SOURCES = loaders/dlopen.c
dlopen_la_LDFLAGS = -module -avoid-version
@@ -111,21 +100,16 @@
shl_load_la_LIBADD = $(LIBADD_SHL_LOAD)
## Make sure these will be cleaned even when they're not built by default:
-CLEANFILES += libltdl.la \
- libltdlc.la \
- libdlloader.la
-
-## Automake-1.9.6 doesn't clean subdir AC_LIBOBJ compiled objects
-## automatically:
-CLEANFILES += $(LIBOBJS) $(LTLIBOBJS)
+CLEANFILES = libltdl.la libltdlc.la libdlloader.la
## --------------------------- ##
## Gnulib Makefile.am snippets ##
## --------------------------- ##
-BUILT_SOURCES += $(ARGZ_H)
-EXTRA_DIST += argz_.h
+## ((( gnulib module argz
+BUILT_SOURCES += $(ARGZ_H)
+EXTRA_DIST += argz_.h
# We need the following in order to create an <argz.h> when the system
# doesn't have one that works with the given compiler.
@@ -133,7 +117,5 @@
argz.h: argz_.h
cp $(srcdir)/argz_.h [EMAIL PROTECTED]
mv [EMAIL PROTECTED] $@
-MOSTLYCLEANFILES += argz.h \
- argz.h-t
-
-# ### END Makefile.am
+MOSTLYCLEANFILES += argz.h argz.h-t
+## ))) gnulib module argz
- --
Gary V. Vaughan ())_. [EMAIL PROTECTED],gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/[EMAIL PROTECTED]/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
iD8DBQFDCM6hFRMICSmD1gYRAgvCAJ0UaL9ayGFGIIpJGAlyfMvupL8B2gCgwaYs
VvwhQ+LdbPAiAxHx3H3qoho=
=BNj/
-----END PGP SIGNATURE-----
