From f30d8e71bf1c27d4de7a31f0eeb4df274746143d Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 16 Aug 2007 23:47:12 +0000 Subject: [PATCH] =?utf8?q?*=20automake.in=20(handle=5Fprograms):=20Also=20?= =?utf8?q?clean=20.libs/=5Flibs=20directory=20for=20=5FPROGRAMS.=20*=20tes?= =?utf8?q?ts/libtoo10.test:=20New=20test.=20*=20tests/Makefile.am:=20Updat?= =?utf8?q?e.=20*=20THANKS:=20Update.=20Report=20by=20Guillermo=20Onta?= =?utf8?q?=C3=B1=C3=B3n.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ChangeLog | 9 +++++++ THANKS | 9 ++++--- automake.in | 2 ++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/libtoo10.test | 63 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 4 deletions(-) create mode 100755 tests/libtoo10.test diff --git a/ChangeLog b/ChangeLog index e3d17d245..596ac30af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-08-16 Ralf Wildenhues + + * automake.in (handle_programs): Also clean .libs/_libs + directory for _PROGRAMS. + * tests/libtoo10.test: New test. + * tests/Makefile.am: Update. + * THANKS: Update. + Report by Guillermo Ontañón. + 2007-08-09 Ralf Wildenhues * configure.ac: Actually require version 2.60 in the test for diff --git a/THANKS b/THANKS index 1344bdf61..3f0ef7084 100644 --- a/THANKS +++ b/THANKS @@ -102,14 +102,15 @@ Gordon Sadler gbsadler1@lcisp.com Greg A. Woods woods@most.weird.com Greg Schafer gschafer@zip.com.au Guido Draheim guidod@gmx.de +Guillermo Ontañón gontanonext@pandasoftware.es Gustavo Carneiro gjc@inescporto.pt -Gwenole Beauchesne gbeauchesne@mandrakesoft.com +Gwenole Beauchesne gbeauchesne@mandrakesoft.com H.J. Lu hjl@lucon.org H.Merijn Brand h.m.brand@hccnet.nl Hans Ulrich Niedermann hun@n-dimensional.de Harald Dunkel harald@CoWare.com Harlan Stenn Harlan.Stenn@pfcs.com -He Li tippa000@yahoo.com +He Li tippa000@yahoo.com Henrik Frystyk Nielsen frystyk@w3.org Ian Lance Taylor ian@cygnus.com Imacat imacat@mail.imacat.idv.tw @@ -178,7 +179,7 @@ Mark Mitchell mark@codesourcery.com Mark Phillips msp@nortelnetworks.com Markku Rossi mtr@ngs.fi Markus F.X.J. Oberhumer k3040e4@wildsau.idv-edu.uni-linz.ac.at -Martin Bravenboer martin@cs.uu.nl +Martin Bravenboer martin@cs.uu.nl Martin Frydl martin@idoox.com Martin Waitz tali@admingilde.org Mathias Doreille doreille@smr.ch @@ -230,7 +231,7 @@ Pavel Roskin pavel_roskin@geocities.com Per Bothner bothner@cygnus.com Per Cederqvist ceder@lysator.liu.se Per Oyvind Hvidsten poeh@enter.vg -Peter Breitenlohner peb@mppmu.mpg.de +Peter Breitenlohner peb@mppmu.mpg.de Peter Eisentraut peter_e@gmx.net Peter Gavin pgavin@debaser.kicks-ass.org Peter Mattis petm@scam.XCF.Berkeley.EDU diff --git a/automake.in b/automake.in index 9bfff454a..d7e48a1a4 100755 --- a/automake.in +++ b/automake.in @@ -2485,6 +2485,8 @@ sub handle_programs # make sure this directory will exist. my $dirstamp = require_build_directory_maybe ($one_file); + $libtool_clean_directories{dirname ($one_file)} = 1; + $output_rules .= &file_contents ('program', $where, PROGRAM => $one_file, diff --git a/tests/Makefile.am b/tests/Makefile.am index 7dbdc390b..ee3534563 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -332,6 +332,7 @@ libtool6.test \ libtool7.test \ libtool8.test \ libtool9.test \ +libtoo10.test \ license.test \ link_c_cxx.test \ link_dist.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 0fb651e47..52a125a94 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -465,6 +465,7 @@ libtool6.test \ libtool7.test \ libtool8.test \ libtool9.test \ +libtoo10.test \ license.test \ link_c_cxx.test \ link_dist.test \ diff --git a/tests/libtoo10.test b/tests/libtoo10.test new file mode 100755 index 000000000..7c0faf9aa --- /dev/null +++ b/tests/libtoo10.test @@ -0,0 +1,63 @@ +#! /bin/sh +# Copyright (C) 2007 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake 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 3, or (at your option) +# any later version. +# +# GNU Automake 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 +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Automake; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Make sure .libs directories are removed for _PROGRAMS. +# Report from Guillermo Ontañón. + +required=libtoolize +. ./defs || exit 1 +set -e + +cat >> configure.in << 'END' +AC_PROG_LIBTOOL +AC_OUTPUT +END + +cat > Makefile.am << 'END' +lib_LTLIBRARIES = lib/libfoo.la +lib_libfoo_la_SOURCES = foo.c +bin_PROGRAMS = src/main +check_PROGRAMS = check/test +src_main_SOURCES = main.c +check_test_SOURCES = main.c +LDADD = lib/libfoo.la +END + +mkdir lib src check +cat > foo.c << 'END' +int foo () { return 0; } +END + +cat > main.c << 'END' +extern int foo (); +int main () { return foo (); } +END + +libtoolize +$ACLOCAL +$AUTOMAKE --add-missing +$AUTOCONF +./configure +$MAKE all check clean +test ! -d src/.libs +test ! -d src/_libs +test ! -d check/.libs +test ! -d check/_libs +$MAKE distcheck -- 2.47.2