From c94de6d8cb9c69d320f3c2ae726e6981085bb6d2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 23 Jan 2005 17:10:12 +0000 Subject: [PATCH] * libltdl/Makefile.am: Add $(AM_LDFLAGS) to all per-target variables *_LDFLAGS as per CVS Automake semantic change. --- ChangeLog | 7 ++++++- libltdl/Makefile.am | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34ab2fc04..ba8fa7770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-23 Ralf Wildenhues + + * libltdl/Makefile.am: Add $(AM_LDFLAGS) to all per-target + variables *_LDFLAGS as per CVS Automake semantic change. + 2005-01-16 Peter O'Gorman * config/ltmain.m4sh (func_mode_link): Don't pass through @@ -12,7 +17,7 @@ Reported by Dr. Hans Ekkehard Plesser -2005-01-12 Guido Draheim (tiny change) +2005-01-14 Guido Draheim (tiny change) * m4/libtool.m4 (AC_PROG_SED): Don't break test loop early. diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index a535a7855..73c940ce8 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -42,7 +42,7 @@ libdlloader_la_SOURCES = libltdl/lt_error.h lt_error.c \ libltdl/lt__glibc.h \ libltdl/lt__dirent.h \ libltdl/slist.h slist.c -libdlloader_la_LDFLAGS = $(VERSION_INFO) +libdlloader_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) libdlloader_la_LIBADD = $(LTLIBOBJS) ## Libltdl brings it all together: @@ -60,12 +60,12 @@ endif 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) +libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) $(LT_DLPREOPEN) libltdl_la_LIBADD = libdlloader.la libltdlc_la_SOURCES = $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) libltdlc_la_CPPFLAGS = -DLTDLOPEN=libltdlc $(AM_CPPFLAGS) -libltdlc_la_LDFLAGS = -weak libdlloader.la $(LT_DLPREOPEN) +libltdlc_la_LDFLAGS = $(AM_LDFLAGS) -weak libdlloader.la $(LT_DLPREOPEN) libltdlc_la_LIBADD = $(libdlloader_la_LIBADD) ## These are installed as a subdirectory of pkgdatadir so that -- 2.47.3