From 39a6d5891ebdd42012efd943b091fed981566d5a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 4 May 1999 12:32:36 +0000 Subject: [PATCH] * library.am (@LIBRARY@): Use $(@XLIBRARY@_AR). * automake.in (handle_libraries): Recognize _AR variable. --- ChangeLog | 5 +++++ automake.in | 7 ++++++- lib/am/library.am | 4 ++-- library.am | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f853138..1b55421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-05-04 Tom Tromey + + * library.am (@LIBRARY@): Use $(@XLIBRARY@_AR). + * automake.in (handle_libraries): Recognize _AR variable. + 1999-04-30 Tom Tromey * automake.in (finish_languages): Always use `-o $@' with diff --git a/automake.in b/automake.in index 1718c1f..1f54ec5 100755 --- a/automake.in +++ b/automake.in @@ -1872,7 +1872,12 @@ sub handle_libraries # Canonicalize names and check for misspellings. $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_SOURCES', - '_OBJECTS', '_DEPENDENCIES'); + '_OBJECTS', '_DEPENDENCIES', '_AR'); + + if (! &variable_defined ($xlib . '_AR')) + { + &define_variable ($xlib . '_AR', '$(AR) cru'); + } if (&variable_defined ($xlib . '_LIBADD')) { diff --git a/lib/am/library.am b/lib/am/library.am index 9132ae6..6e99210 100644 --- a/lib/am/library.am +++ b/lib/am/library.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1999 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 @@ -17,5 +17,5 @@ ## 02111-1307, USA. @LIBRARY@: $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_DEPENDENCIES) -rm -f @LIBRARY@ - $(AR) cru @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) + $(@XLIBRARY@_AR) @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) $(RANLIB) @LIBRARY@ diff --git a/library.am b/library.am index 9132ae6..6e99210 100644 --- a/library.am +++ b/library.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1999 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 @@ -17,5 +17,5 @@ ## 02111-1307, USA. @LIBRARY@: $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_DEPENDENCIES) -rm -f @LIBRARY@ - $(AR) cru @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) + $(@XLIBRARY@_AR) @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) $(RANLIB) @LIBRARY@ -- 2.7.4