Fixlets

diff --git a/ChangeLog b/ChangeLog
index 0cba03d..065ffc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+Tue Aug  6 10:58:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * aclocal.in (parse_arguments): Mention GNU.
+       * automake.in (parse_arguments): Mention GNU.
+
 Mon Aug  5 00:12:45 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_programs): Define program_LINK.
+       * program.am (@PROGRAM@): Use program_LINK to link.
+
        * Released version 1.1b
 
        * automake.in (scan_configure): AM_INIT_AUTOMAKE sets

diff --git a/TODO b/TODO
index 3241aba..42be081 100644 (file)
--- a/TODO
+++ b/TODO
@@ -165,9 +165,6 @@ Lex, yacc support:
 require AC_PROG_CXX if any C++ source files found?
 Better support for C++ all around
 
-Write autoconf macro to do all work necessary for automake.  Eg define
-PACKAGE, VERSION, etc.
-
 'maintainer-clean' should "rm -rf .deps".  Ditto distclean
 Should look for clean-local targets in Makefile.am.
 

diff --git a/aclocal.in b/aclocal.in
index 64dbc34..457c777 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -104,7 +104,7 @@ sub parse_arguments
        }
        elsif ($arglist[0] eq '--version')
        {
-           print "aclocal - $PACKAGE $VERSION\n";
+           print "aclocal - GNU $PACKAGE $VERSION\n";
            exit 0;
        }
        elsif ($arglist[0] eq '--help')

diff --git a/automake.in b/automake.in
index a7a7216..b5c7cdc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -233,7 +233,7 @@ sub parse_arguments
     {
        if ($arglist[0] eq "--version")
        {
-           print "automake - $PACKAGE $VERSION\n";
+           print "automake - GNU $PACKAGE $VERSION\n";
            exit 0;
        }
        elsif ($arglist[0] eq "--help")
@@ -747,6 +747,12 @@ sub handle_programs
            $output_vars .= $xname . '_LDADD = $(LDADD)' . "\n";
        }
 
+       # Define prog_LINK unless user did.
+       if (! &variable_defined ($one_file . '_LINK'))
+       {
+           $output_vars .= $xname . '_LINK = $(LINK)' . "\n";
+       }
+
        $output_rules .=
            &file_contents_with_transform
                ('s/\@PROGRAM\@/' . $one_file . '/go;'

diff --git a/configure b/configure
index f7f9208..640f6bf 100755 (executable)
--- a/configure
+++ b/configure
@@ -597,7 +597,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
 
 PACKAGE=automake
 
-VERSION=1.1b
+VERSION=1.1c
 
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=

diff --git a/configure.in b/configure.in
index a0a7cd5..80db067 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.1b)
+AM_INIT_AUTOMAKE(automake, 1.1c)
 
 AC_PROG_MAKE_SET
 AC_ARG_PROGRAM

diff --git a/lib/am/program.am b/lib/am/program.am
index 14950de..87abac0 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)
-       $(LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)
+       $(@XPROGRAM@_LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)

diff --git a/program.am b/program.am
index 14950de..87abac0 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)
-       $(LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)
+       $(@XPROGRAM@_LINK) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)

diff --git a/version.texi b/version.texi
index 0f31c18..262db4f 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 4 August 1996
-@set EDITION 1.1b
-@set VERSION 1.1b
+@set EDITION 1.1c
+@set VERSION 1.1c