[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: LIBTOOLFLAGS missing in install-%DIR%LTLIBRARIES and uninstall-%DIR%
From: |
Ralf Wildenhues |
Subject: |
Re: LIBTOOLFLAGS missing in install-%DIR%LTLIBRARIES and uninstall-%DIR%LTLIBRARIES targets |
Date: |
Wed, 18 Jul 2007 22:43:08 +0200 |
User-agent: |
Mutt/1.5.13 (2006-08-11) |
Hello Francesco,
Apologies for the enormous delay.
* Francesco Salvestrini wrote on Tue, Feb 13, 2007 at 02:05:02PM CET:
>
> I tried to pass the --silent flag to libtool via AM_LIBTOOLFLAGS,
> LIBTOOLFLAGS and LIBRARY_LIBTOOLFLAGS but my flags don't get passed
> to libtool in the install and uninstall targets.
Thanks for the report and patch. I think it's a good idea, no, I
think it should have been done all along with the original addition
of *LIBTOOLFLAGS, and I am going to install this to branch-1-10 and
HEAD, if noone complains in the very near future.
Cheers,
Ralf
2007-07-18 Francesco Salvestrini <address@hidden>
Ralf Wildenhues <address@hidden>
* 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.
Index: lib/am/ltlib.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/ltlib.am,v
retrieving revision 1.34
diff -u -r1.34 ltlib.am
--- lib/am/ltlib.am 19 Aug 2006 15:55:52 -0000 1.34
+++ lib/am/ltlib.am 10 Mar 2007 13:51:23 -0000
@@ -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 @@
## 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 @@
@$(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
Index: lib/am/progs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/progs.am,v
retrieving revision 1.47
diff -u -r1.47 progs.am
--- lib/am/progs.am 19 Aug 2006 15:55:52 -0000 1.47
+++ lib/am/progs.am 10 Mar 2007 13:51:23 -0000
@@ -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 @@
## 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; \
Index: tests/libtool7.test
===================================================================
RCS file: /cvs/automake/automake/tests/libtool7.test,v
retrieving revision 1.4
diff -u -r1.4 libtool7.test
--- tests/libtool7.test 14 May 2005 20:28:55 -0000 1.4
+++ tests/libtool7.test 10 Mar 2007 16:03:38 -0000
@@ -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 @@
$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 '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
- Re: LIBTOOLFLAGS missing in install-%DIR%LTLIBRARIES and uninstall-%DIR%LTLIBRARIES targets,
Ralf Wildenhues <=