added assembler support

13 files changed, 92 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index f32a91850..d9265f670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
+Wed Aug 27 19:26:45 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* compile.am: Add suffix rules for ".s.o" and ".S.o" so assembler
+	files can be used.
+	* libtool.am: Add suffix rules for ".s.lo" and ".S.lo" so assembler
+	files can be used.
+	* automake.in: Add .S and .s to the standard list of suffixes so
+	assembler files can be used.
+
+Fri Oct 24 13:39:01 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* m4/exeext.m4: Require AM_MINGW32.  Check MINGW32 setting.
+
+Thu Oct 23 21:16:28 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* m4/init.m4 (missing_dir): AC_REQUIRE AM_SANITY_CHECK,
+	AC_ARG_PROGRAM, and AC_PROG_MAKE_SET.
+
+Tue Oct 21 16:49:36 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_options): Recognize `cygnus'.
+
+Tue Sep  9 17:09:47 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* m4/mingw.m4: New file for mingw32 support.
+	* m4/exeext.m4: Also check for the mingw32 environment.
+
 Tue Oct 21 00:39:44 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* m4/Makefile.am (m4data_DATA): Added mingw.m4.
+
 	* automake.in (handle_lib_objects_cond): Don't require @LEXLIB@.
 	(handle_programs): Likewise.
 
diff --git a/NEWS b/NEWS
index e861aff08..bf25e26f8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ New in 1.2c:
 * Better Cygwin32 support
 * Support for suffix rules with _SOURCES variables
 * New options `readme-alpha' and `check-news'; Gnits mode sets these
+* @LEXLIB@ no longer required when lex source seen
+* Built-in support for assembly
+* aclocal gives error if `AM_' macro not found
 
 New in 1.2:
 * Bug fixes
diff --git a/README-alpha b/README-alpha
index f7a519089..5b2d46857 100644
--- a/README-alpha
+++ b/README-alpha
@@ -2,20 +2,8 @@ This is a test release of this package.
 Please do not send reports about this release to any
 GNU mailing list or newsgroup.
 
-A few notes on this particular release:
-
-I'm trying to clean things up for the 1.2 release.  If you know of
-serious problems or limitations, please tell me.
-
-
-A few things that I still haven't gotten to fixing:
-
-* The `acinstall' program is distributed but not used; I still must
-  write the internal support for it.  This is the program that will be
-  used to install macro files for aclocal.  This probably won't happen
-  before 1.2.
-
-* The documentation still needs more work.  Suggestions welcome.
+The documentation still needs more work.  Suggestions welcome.
+Patches even more welcome.
 
 Please send comments and problem reports about this test release to
 tromey@cygnus.com -- ignore the bug reporting addresses given by the
diff --git a/automake.in b/automake.in
index ea5279e00..1f90cb4f9 100755
--- a/automake.in
+++ b/automake.in
@@ -625,6 +625,10 @@ sub handle_options
 	{
 	    &set_strictness ($_);
 	}
+	elsif ($_ eq 'cygnus')
+	{
+	    $cygnus_mode = 1;
+	}
 	elsif (/ansi2knr/)
 	{
 	    # An option like "../lib/ansi2knr" is allowed.  With no
@@ -724,7 +728,7 @@ sub get_object_extension
 	    }
 	}
 
-	push (@suffixes, '.c', '.o');
+	push (@suffixes, '.c', '.o', '.S', '.s');
 	push (@clean, 'compile');
 
 	$included_generic_compile = 1;
diff --git a/compile.am b/compile.am
index ea67e7bf6..97eb6afb1 100644
--- a/compile.am
+++ b/compile.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, 1997 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
@@ -18,6 +18,12 @@
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
 	-rm -f *.o core
diff --git a/lib/am/compile.am b/lib/am/compile.am
index ea67e7bf6..97eb6afb1 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.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, 1997 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
@@ -18,6 +18,12 @@
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
 	-rm -f *.o core
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 53374a1e8..c4a3b159c 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -20,6 +20,13 @@
 ## if the program doesn't have a name that libtool expects.
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
+## These are just copies of the above rule.
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/libtool.am b/libtool.am
index 53374a1e8..c4a3b159c 100644
--- a/libtool.am
+++ b/libtool.am
@@ -20,6 +20,13 @@
 ## if the program doesn't have a name that libtool expects.
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
+## These are just copies of the above rule.
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 42571deec..4f7edf3d0 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \
-maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
-winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4 \
-cygwin.m4 cond.m4 exeext.m4
+m4data_DATA = ccstdc.m4 cond.m4 cygwin.m4 dmalloc.m4 exeext.m4 init.m4 \
+install.m4 lispdir.m4 maintainer.m4 mingw.m4 protos.m4 ptrdiff.m4 \
+regex.m4 strtod.m4 termios.m4 winsz.m4 mktime.m4 error.m4 obstack.m4 \
+sanity.m4 header.m4 missing.m4
 
 EXTRA_DIST = $(m4data_DATA)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 892e3db90..028d73b1f 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -65,10 +65,10 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \
-maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
-winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4 \
-cygwin.m4 cond.m4 exeext.m4
+m4data_DATA = ccstdc.m4 cond.m4 cygwin.m4 dmalloc.m4 exeext.m4 init.m4 \
+install.m4 lispdir.m4 maintainer.m4 mingw.m4 protos.m4 ptrdiff.m4 \
+regex.m4 strtod.m4 termios.m4 winsz.m4 mktime.m4 error.m4 obstack.m4 \
+sanity.m4 header.m4 missing.m4
 
 EXTRA_DIST = $(m4data_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/m4/exeext.m4 b/m4/exeext.m4
index a73febe98..655e199a5 100644
--- a/m4/exeext.m4
+++ b/m4/exeext.m4
@@ -8,9 +8,10 @@ dnl environment. But if we're not, then it compiles a test program
 dnl to see if there is a suffix for executables.
 AC_DEFUN(AM_EXEEXT,
 [AC_REQUIRE([AM_CYGWIN32])
+AC_REQUIRE([AM_MINGW32])
 AC_MSG_CHECKING([for executable suffix])
 AC_CACHE_VAL(am_cv_exeext,
-[if test "$CYGWIN32" = yes; then
+[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
 am_cv_exeext=.exe
 else
 cat > am_c_test.c << 'EOF'
diff --git a/m4/init.m4 b/m4/init.m4
index b5cdeb041..3ce28d5da 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -20,8 +20,8 @@ fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -29,4 +29,4 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
diff --git a/m4/mingw.m4 b/m4/mingw.m4
new file mode 100644
index 000000000..3b39642ef
--- /dev/null
+++ b/m4/mingw.m4
@@ -0,0 +1,12 @@
+# Check to see if we're running under Mingw, without using
+# AC_CANONICAL_*.  If so, set output variable MINGW32 to "yes".
+# Otherwise set it to "no".
+
+dnl AM_MINGW32()
+AC_DEFUN(AM_MINGW32,
+[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32,
+[AC_TRY_COMPILE(,[int main () { return __MINGW32__; }],
+am_cv_mingw32=yes, am_cv_mingw32=no)
+rm -f conftest*])
+MINGW32=
+test "$am_cv_mingw32" = yes && MINGW32=yes])