From 0ee0ac50d8da5b8809bac38bb35313d71cc0fac2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 22 Jul 2007 08:42:35 +0000 Subject: [PATCH] * lib/am/ltlib.am (install-%DIR%LTLIBRARIES) (uninstall-%DIR%LTLIBRARIES): Use $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * lib/am/progs.am (install-%DIR%PROGRAMS) (uninstall-%DIR%PROGRAMS): Likewise. * tests/libtool7.test: Update test for `install' and `uninstall' cases. * NEWS, THANKS: Update. --- ChangeLog | 12 ++++++++++++ NEWS | 5 +++++ THANKS | 1 + lib/am/ltlib.am | 10 +++++----- lib/am/progs.am | 8 ++++---- tests/libtool7.test | 13 +++++++++++-- 6 files changed, 38 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30806605c..d3df99803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-07-22 Francesco Salvestrini + Ralf Wildenhues + + * lib/am/ltlib.am (install-%DIR%LTLIBRARIES) + (uninstall-%DIR%LTLIBRARIES): Use $(AM_LIBTOOLFLAGS) and + $(LIBTOOLFLAGS). + * lib/am/progs.am (install-%DIR%PROGRAMS) + (uninstall-%DIR%PROGRAMS): Likewise. + * tests/libtool7.test: Update test for `install' and + `uninstall' cases. + * NEWS, THANKS: Update. + 2007-07-16 Ralf Wildenhues * doc/automake.texi: Remove Front-Cover and Back-Cover Texts, diff --git a/NEWS b/NEWS index 09c0a739b..4fd57de63 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ New in 1.10a: (and new in Automake 1.10) is degraded to a warning. This helps in the common case where the Autoconf versions used are compatible. +* Change to Libtool support: + + - Libtool generic flags are now passed to the install and uninstall + modes as well. + * Languages changes: - subdir-object mode works now with Fortran (F77, FC, preprocessed diff --git a/THANKS b/THANKS index 8be852b2a..f0768a0bc 100644 --- a/THANKS +++ b/THANKS @@ -87,6 +87,7 @@ Erik Lindahl E.Lindahl@chem.rug.nl Esben Haabendal Soerensen bart@kom.aau.dk Ezra Peisach epeisach@MED-XTAL.BU.EDU Flavien Astraud flav42@yahoo.fr +Francesco Salvestrini salvestrini@gmail.com François Pinard pinard@iro.umontreal.ca Fred Fish fnf@ninemoons.com Ganesan Rajagopal rganesan@novell.com diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index b1c5f099e..e440772e1 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, -## 2005, 2006 Free Software Foundation, Inc. +## 2005, 2006, 2007 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 @@ -47,8 +47,8 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) ## if the program doesn't have a name that libtool expects. ## Use INSTALL and not INSTALL_DATA because libtool knows the right ## permissions to use. -?LIBTOOL? echo " $(LIBTOOL) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ -?LIBTOOL? $(LIBTOOL) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ +?LIBTOOL? echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ +?LIBTOOL? $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ ?!LIBTOOL? echo " $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ ?!LIBTOOL? $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ else :; fi; \ @@ -66,8 +66,8 @@ uninstall-%DIR%LTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ ?BASE? p=$(am__strip_dir) \ -?LIBTOOL? echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ -?LIBTOOL? $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ +?LIBTOOL? echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ +?LIBTOOL? $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ ?!LIBTOOL? echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ ?!LIBTOOL? rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ done diff --git a/lib/am/progs.am b/lib/am/progs.am index cf1a1e316..98662fed0 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2006 -## Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, +## 2006, 2007 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 @@ -51,8 +51,8 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS) ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. -?LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ -?LIBTOOL? $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(%DIR%PROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit 1; \ +?LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ +?LIBTOOL? $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%PROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit 1; \ ?!LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ ?!LIBTOOL? $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit 1; \ else :; fi; \ diff --git a/tests/libtool7.test b/tests/libtool7.test index 579eed169..845e975e6 100755 --- a/tests/libtool7.test +++ b/tests/libtool7.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -85,7 +85,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing --copy -./configure +./configure --prefix=`pwd`/_inst env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 cat output grep '1BEG: libmod1.la mod2.la :END1' output @@ -93,3 +93,12 @@ grep '2BEG: mod2.la :END2' output grep '3BEG: .*silent.*silent.* :END3' output test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l` $MAKE + +env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 +cat output +grep 'silent.*silent.*prg' output +grep 'silent.*silent.*libmod1' output + +env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 +cat output +grep 'silent.*silent.*libmod1' output -- 2.47.2