Linking fixes

diff --git a/ChangeLog b/ChangeLog
index 5624fc71a988ecd088a8469bce6ddf5b359a8dca..9441717df5b59a979484bc705249d4dc5289da32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Fri Aug  9 09:18:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_programs): Substitute @XLINK@.  Make sure
+       linker variable is transformed name.
+       * program.am (@PROGRAM@): Use @XLINK@ to link.
+
        * automake.in (handle_scripts): Fixed call to
        am_primary_prefixes.
        (handle_libraries): Better error message when AC_PROG_RANLIB

diff --git a/automake.in b/automake.in
index 86a18feb7d29a0c014ff625f4c4ce65b3983914c..553df4ff3344c000c3a1ff1b28fc4107ba588660 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -775,16 +775,22 @@ sub handle_programs
            $output_vars .= $xname . '_LDADD = $(LDADD)' . "\n";
        }
 
-       # Define prog_LINK unless user did.
-       if (! &variable_defined ($one_file . '_LINK'))
+       # Determine program to use for link.
+       local ($xlink);
+       if (&variable_defined ($xname . '_LINK'))
        {
-           $output_vars .= $xname . '_LINK = $(LINK)' . "\n";
+           $xlink = $xname . '_LINK';
+       }
+       else
+       {
+           $xlink = 'LINK';
        }
 
        $output_rules .=
            &file_contents_with_transform
                ('s/\@PROGRAM\@/' . $one_file . '/go;'
-                . 's/\@XPROGRAM\@/' . $xname . '/go;',
+                . 's/\@XPROGRAM\@/' . $xname . '/go;'
+                . 's/\@XLINK\@/' . $xlink . '/go;',
                 'program');
     }
 

diff --git a/lib/am/program.am b/lib/am/program.am
index 87abac0ee42c996639cec4c689d6ab3a8a6b5e45..03227793f346820538af819e3dc55c37c7a2f517 100644 (file)
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -16,4 +16,4 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @PROGRAM@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES)
-       $(@XPROGRAM@_LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)
+       $(@XLINK@) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)

diff --git a/program.am b/program.am
index 87abac0ee42c996639cec4c689d6ab3a8a6b5e45..03227793f346820538af819e3dc55c37c7a2f517 100644 (file)
--- a/program.am
+++ b/program.am
@@ -16,4 +16,4 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @PROGRAM@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES)
-       $(@XPROGRAM@_LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)
+       $(@XLINK@) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)