From 0522298fd93613acbed0dd06c7113f73093f6d02 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 31 Jan 2003 23:35:01 +0000 Subject: [PATCH] * automake.texi (Program and Library Variables): Clarify that _LIBADD is for libraries and _LDADD for programs. --- ChangeLog | 3 +++ Makefile.in | 15 +++++------ aclocal.m4 | 54 +++++++++++++++++++++++++++++----------- automake.texi | 12 ++++----- configure | 12 ++++++++- lib/Automake/Makefile.in | 16 ++++++------ lib/Makefile.in | 16 ++++++------ lib/am/Makefile.in | 4 +-- m4/Makefile.in | 4 +-- stamp-vti | 4 +-- tests/Makefile.in | 1 + version.texi | 4 +-- 12 files changed, 89 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72cea477..d752932f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-01-31 Alexandre Duret-Lutz + * automake.texi (Program and Library Variables): Clarify that + _LIBADD is for libraries and _LDADD for programs. + * automake.in (handle_source_transform): Correct typo from 2003-01-23. 2003-01-28 Alexandre Duret-Lutz diff --git a/Makefile.in b/Makefile.in index 177d8ccd..0f0ec6d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -153,7 +154,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \ stamp-vti version.texi -DIST_SUBDIRS = . m4 lib tests +DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -404,8 +405,8 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = . distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) am__remove_distdir = \ { test ! -d $(distdir) \ @@ -446,15 +447,15 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ diff --git a/aclocal.m4 b/aclocal.m4 index e6fa0a2c..10ec3310 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -16,7 +16,7 @@ # This macro actually does too much some checks are only needed if # your package does certain things. But this isn't really a big deal. -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -34,7 +34,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -108,6 +108,7 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], @@ -446,9 +447,42 @@ fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 4 -*- Autoconf -*- +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. -# Copyright 1999, 2000, 2001 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, or (at your option) +# any later version. + +# 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 +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# serial 5 -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003 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 @@ -566,16 +600,8 @@ AM_CONDITIONAL([am__fastdep$1], [ # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null -AC_SUBST([DEPDIR]) +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) diff --git a/automake.texi b/automake.texi index 9722ecfe..5e1857db 100644 --- a/automake.texi +++ b/automake.texi @@ -2509,14 +2509,14 @@ libmaude_a_AR = $(CXX) -ar -o @end example @item maude_LIBADD -Extra objects can be added to a library using the @samp{_LIBADD} -variable. This should be used for objects determined by -@code{configure}. +Extra objects can be added to a @emph{library} using the @samp{_LIBADD} +variable. For instance this should be used for objects determined by +@code{configure} (@pxref{A Library}). @item maude_LDADD -Extra objects can be added to a shared library or a program by listing -them in the @samp{_LDADD} variable. This should be used for objects -determined by @code{configure}. +Extra objects can be added to a @emph{program} by listing them in the +@samp{_LDADD} variable. For instance this should be used for objects +determined by @code{configure} (@pxref{Linking}). @samp{_LDADD} and @samp{_LIBADD} are inappropriate for passing program-specific linker flags (except for @samp{-l}, @samp{-L}, diff --git a/configure b/configure index 8c5c82e5..63bccbaf 100755 --- a/configure +++ b/configure @@ -273,7 +273,7 @@ PACKAGE_STRING='GNU Automake 1.7a' PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_unique_file="automake.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1454,6 +1454,15 @@ echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -2446,6 +2455,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t +s,@am__leading_dot@,$am__leading_dot,;t t s,@APIVERSION@,$APIVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t s,@PERL@,$PERL,;t t diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 52cb4717..def15e27 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -119,7 +120,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in -DIST_SUBDIRS = tests +DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -267,9 +268,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ @@ -297,15 +295,15 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 5addfa63..9bf4e807 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -117,7 +118,7 @@ DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) COPYING INSTALL \ Makefile.am Makefile.in ansi2knr.1 ansi2knr.c compile \ config.guess config.sub depcomp elisp-comp install-sh mdate-sh \ missing mkinstalldirs py-compile texinfo.tex ylwrap -DIST_SUBDIRS = Automake am +DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -283,9 +284,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ @@ -313,15 +311,15 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ fi; \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 3995ed1c..fb066b74 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -145,9 +146,6 @@ CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 772f1998..78f87280 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -192,9 +193,6 @@ CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ diff --git a/stamp-vti b/stamp-vti index cdfd150f..b1f98f25 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 22 January 2003 -@set UPDATED-MONTH January 2003 +@set UPDATED 1 February 2003 +@set UPDATED-MONTH February 2003 @set EDITION 1.7a @set VERSION 1.7a diff --git a/tests/Makefile.in b/tests/Makefile.in index 5830a601..aebda592 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -72,6 +72,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am__leading_dot = @am__leading_dot@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ diff --git a/version.texi b/version.texi index cdfd150f..b1f98f25 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 22 January 2003 -@set UPDATED-MONTH January 2003 +@set UPDATED 1 February 2003 +@set UPDATED-MONTH February 2003 @set EDITION 1.7a @set VERSION 1.7a -- 2.43.5