* library.am (@LIBRARY@): Use $(@XLIBRARY@_AR).

	* automake.in (handle_libraries): Recognize _AR variable.

diff --git a/ChangeLog b/ChangeLog
index f853138969998fbc10d5cd21d75230a221d047c7..1b55421265599928d28480a390f4445a28ba47fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-04  Tom Tromey  <tromey@cygnus.com>
+
+       * library.am (@LIBRARY@): Use $(@XLIBRARY@_AR).
+       * automake.in (handle_libraries): Recognize _AR variable.
+
 1999-04-30  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (finish_languages): Always use `-o $@' with

diff --git a/automake.in b/automake.in
index 1718c1f013e32cff15b9f51ee7fbbc6e0ea186e2..1f54ec5dccf15812b2d3e28f575d4cd274bab0ef 100755 (executable)
--- 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 9132ae6cb8d83cca9925ecfa6906a0609d7b7a78..6e99210ebe8e805fb3667784c96c3681d8424fb6 100644 (file)
--- 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 9132ae6cb8d83cca9925ecfa6906a0609d7b7a78..6e99210ebe8e805fb3667784c96c3681d8424fb6 100644 (file)
--- 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@