Beginnings of new libtool support

diff --git a/ChangeLog b/ChangeLog
index 1620d39..85486d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 15 16:39:29 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in: Applied libtool-related patches from Gord.
+
+       * Makefile.am (pkgdata_DATA): Removed aclocal.m4.
+
 Thu Nov 14 23:11:09 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_yacc_lex_cxx): Don't auto-define YACC, LEX,

diff --git a/Makefile.am b/Makefile.am
index 53cc173..a510b0f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
+ansi2knr.1 lisp.am lisp-clean.am
 
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \

diff --git a/Makefile.in b/Makefile.in
index 3a94426..73c73bd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
+ansi2knr.1 lisp.am lisp-clean.am
 
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap acinstall

diff --git a/TODO b/TODO
index a5fa55a..f5f613f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,6 +5,8 @@ Priorities for release:
 * `missing' program
 * copyrights on m4 files, aclocal output
 
+* only remove libtool at top level?
+
 * clean up source directory by moving stuff into subdirs
 
 !! foo_LIBRARIES = @JOE@  ->  _LIBFILES is wrong
@@ -321,6 +323,8 @@ containing application.
 
 Document:
 
+a package that installs its own aclocal macros
+
 --cygnus
 
 OMIT_DEPENDENCIES

diff --git a/automake.in b/automake.in
index bf439c1..d4e0da0 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -406,13 +406,14 @@ sub generate_makefile
     $relative_dir = &dirname ($makefile);
 
     # At the toplevel directory, we might need config.guess, config.sub
-    # or libtool.
+    # or libtool scripts (ltconfig and ltmain.sh).
     if ($relative_dir eq '.')
     {
        # libtool requires some files.
        &require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
                                           'config.sub', 'config.guess',
-                                          'libtool') if $seen_libtool;
+                                          'ltconfig', 'ltmain.sh')
+           if $seen_libtool;
 
         # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and
         # config.sub.
@@ -854,26 +855,26 @@ sub handle_single_transform_list
            }
 
            # Transform source files into .o files.  List of C++
-           # extensions comes from Emacs 19.32 etags.
+           # extensions comes from Emacs 19.34 etags.
            if (s/\.(c\+\+|cc|cpp|cxx|C)$/o/)
            {
                $cxx_extensions{'.' . $1} = 1;
                $linker = 'CXXLINK';
            }
-           else
+           elsif (s/\.([Ff]\\|f90\\|for)$/o/)
            {
                # FORTRAN support.  FIXME: not finished.
-               s/\.f90$/.o/g;
-               s/\.for$/.o/g;
-
+           }
+           else
+           {
                # C, yacc, and lex need special $obj extension, for
                # de-ansification.  Hopefully someday this will go
                # away.
                s/\.[cly]$/$obj/g;
 
-               # .f and .F are fortran.  .s is assembly.  .M is
-               # Objective-C++.  .m is Objective-C.
-               s/\.[fFsmM]$/$obj/g;
+               # .s is assembly.  .M is Objective-C++.  .m is
+               # Objective-C.
+               s/\.[smM]$/$obj/g;
 
                # FIXME: of course, this should only happen for C
                # source.  The multi-language support must really be
@@ -1321,18 +1322,8 @@ sub handle_libraries
        &define_pretty_variable ('LIBFILES ', @libfiles_list);
     }
 
-    if ($seen_libtool)
-    {
-       &define_variable ('AR', '$(LIBTOOL) archive');
-       &define_variable ('RANLIB', '$(LIBTOOL) ranlib');
-       &define_variable ('LCOMPILE', ('$(LIBTOOL) compile $(DEFS) $(INCLUDES)'
-                                      . ' $(CPPFLAGS) $(CFLAGS)'));
-    }
-    else
-    {
-       &define_variable ('AR', 'ar');
-       &define_configure_variable ('RANLIB');
-    }
+    &define_variable ('AR', 'ar');
+    &define_configure_variable ('RANLIB');
 }
 
 # See if any _SOURCES variable were misspelled.
@@ -2788,6 +2779,7 @@ sub do_one_clean_target
     elsif ($name . $target eq 'distclean')
     {
        $output_rules .= "\trm -f config.status\n";
+       $output_rules .= "\trm -f libtool\n" if $seen_libtool;
     }
     $output_rules .= "\n";
 }
@@ -3743,7 +3735,7 @@ sub initialize_global_constants
     @common_sometimes =
        (
         "aclocal.m4", "acconfig.h", "config.h.top",
-        "config.h.bot", "stamp-h.in", 'stamp-vti', 'libtool'
+        "config.h.bot", "stamp-h.in", 'stamp-vti', 'ltconfig', 'ltmain.sh'
         );
 
     $USAGE = "\

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 53cc173..a510b0f 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -16,7 +16,7 @@ mans-vars.am program.am progs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-vers.am texinfos.am libs-clean.am \
 progs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
+ansi2knr.1 lisp.am lisp-clean.am
 
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \