Makefile.in (install): Don't install if $(libsubdir) is empty...

Sat Jun 13 03:46:40 1998  Craig Burley  <burley@gnu.org>
	* Makefile.in (install): Don't install if $(libsubdir)
	is empty; issue a diagnostic saying top-level Makefile
	must pass it in instead, and exit.
	* Makefile.in (g2c.h): Rename from f2c.h.
	* Makefile.in, libF77/Makefile.in, libI77/Makefile.in,
	libU77/Makefile.in: Rewrite config and var assignment
	sections to be even more minimal than before, and to
	more clearly documented what macros are expected to be
	set and to what sorts of values.  Eliminate CROSS and
	related stuff, since there's no such things as CROSS
	in egcs.  Rename GCC_FOR_TARGET to CC throughout.
	* Makefile.in (stamp-libi77, stamp-libf77, stamp-libu77):
	Eliminate CROSS.
	* configure.in: Eliminate CROSS.
	Rename libf2c.a and f2c.h to libg2c.a and g2c.h,
	normalize and simplify g77/libg2c build process:
	* Makefile.in: Remove all stuff pertaining to
	installation, cleaning, and so on.  Parent Makefile
	does all that now.  Pass F2C_H_DIR,
	G2C_H_DIR, and GCC_H_DIR, the pathnames for the
	directories containing f2c.h, g2c.h, and other
	#include files, to subdirectory Makefiles.
	(stamp-libf77, stamp-libi77, stamp-libu77):
	Don't specify `-f Makefile' anymore, it's not needed
	now that subdirectory makefile's from netlib are
	renamed to makefile.netlib in g77 source (and to
	makefile.ori by configuration process, in case they're
	still around somehow).
	(stamp-libe77): Don't make libE77 dir unless it doesn't
	exist, if it does just delete all objects in it.
	Compile using $(GCC_FOR_TARGET), not $(CC).
	(rebuilt): Remove this and all subordinate targets,
	as parent Makefile now handles all that.
	(*clean): Remove.
	* configure.in (Pad_UDread, ALWAYS_FLUSH, WANT_LEAD_0):
	Remove these and commentary to new f2c.h file.
	AC_OUTPUT g2c.h instead of f2c.h.  Remove old commentary
	regarding concatenation.
	* g2c.h.in: Rename from f2c.h.in, add appropriate
	commentary.
	* f2c.h: New file, a wrapper for g2c.h that does
	libg2c-specific stuff.
	* libF77/Makefile.in, libI77/Makefile.in, libU77/Makefile.in:
	Change $(ALL_CFLAGS) to use F2C_H_DIR, G2C_H_DIR, and GCC_H_DIR
	macros.  Remove F2C_H macro, replace use with explicit
	dependencies on f2c.h and g2c.h.
	(*clean): Remove.

From-SVN: r20507

1 files changed, 8 insertions, 58 deletions

diff --git a/libf2c/configure.in b/libf2c/configure.in
index 69d05d7..a2d9fe9 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -21,24 +21,12 @@
 
 AC_INIT(libF77/Version.c)
 
-AC_REVISION(1.10)
+AC_REVISION(1.11)
 
-dnl AC_C_CROSS
-dnl Gives misleading `(cached)' message from the check.
-if test "$CROSS";then
-  if test "$CC_FOR_TARGET"; then
-    CC="$CC_FOR_TARGET"
-  else
-    CC="../../xgcc -B../../xgcc/"
-  fi
-  ac_cv_c_cross=yes
-else
-  dnl Checks for programs.
-  # For g77 we'll set CC to point at the built gcc, but this will get it into
-  # the makefiles
-  AC_PROG_CC
-  ac_cv_c_cross=no
-fi
+dnl Checks for programs.
+# For g77 we'll set CC to point at the built gcc, but this will get it into
+# the makefiles
+AC_PROG_CC
 
 dnl These should be inherited in the recursive make, but ensure they are
 dnl defined:
@@ -213,11 +201,8 @@ AC_TRY_RUN(changequote(<<, >>)dnl
 AC_CACHE_VAL(g77_cv_sys_sprintf_ansi,
      g77_cv_sys_sprintf_ansi=$g77_cv_sys_sprintf_ansi)
 dnl We get a misleading `(cached)' message...
-if test $ac_cv_c_cross = no; then
-  AC_MSG_RESULT($g77_cv_sys_sprintf_ansi)
-else
-  AC_MSG_RESULT([can't tell -- assuming no])
-fi
+AC_MSG_RESULT($g77_cv_sys_sprintf_ansi)
+
 # The cygwin patch takes steps to avoid defining USE_STRLEN here -- I don't
 # understand why.
 if test $g77_cv_sys_sprintf_ansi != yes; then 
@@ -347,44 +332,11 @@ AC_SUBST(F2C_LONGINT)
 
 dnl maybe check for drem/remainder
 
-AC_SUBST(CROSS)
-
-
 # This EOF_CHAR is a misfeature on unix.
 AC_DEFINE(NO_EOF_CHAR_CHECK)
 
 AC_DEFINE(Skip_f2c_Undefs)
 
-dnl Craig had these in f2c.h, but they're only relevant for building libf2c
-dnl anyway.
-
-dnl   For GNU Fortran (g77), we always enable the following behaviors for
-dnl   libf2c, to make things easy on the programmer.  The alternate
-dnl   behaviors have their uses, and g77 might provide them as compiler,
-dnl   rather than library, options, so only a single copy of a shared libf2c
-dnl   need be built for a system.
-
-dnl   This makes unformatted I/O more consistent in relation to other
-dnl   systems.  It is not required by the F77 standard.
-
-AC_DEFINE(Pad_UDread)
-
-dnl   This makes ERR= and IOSTAT= returns work properly in disk-full
-dnl   situations, making things work more as expected.  It slows things
-dnl   down, so g77 will probably someday choose the original implementation
-dnl   on a case-by-case basis when it can be shown to not be necessary
-dnl   (e.g. no ERR= or IOSTAT=) or when it is given the appropriate
-dnl   compile-time option or, perhaps, source-code directive.
-
-dnl AC_DEFINE(ALWAYS_FLUSH)
-
-dnl   Most Fortran implementations do this, so to make it easier
-dnl   to compare the output of g77-compiled programs to those compiled
-dnl   by most other compilers, tell libf2c to put leading zeros in
-dnl   appropriate places on output
-
-AC_DEFINE(WANT_LEAD_0)
-
 # avoid confusion in case the `makefile's from the f2c distribution have
 # got put here
 test -f libF77/makefile && mv libF77/makefile  libF77/makefile.ori
@@ -392,11 +344,9 @@ test -f libI77/makefile && mv libI77/makefile  libI77/makefile.ori
 test -f libU77/makefile && mv libU77/makefile  libU77/makefile.ori
 
 AC_CONFIG_SUBDIRS(libU77)
-AC_OUTPUT(Makefile f2c.h libI77/Makefile libF77/Makefile)
+AC_OUTPUT(Makefile g2c.h libI77/Makefile libF77/Makefile)
 
 dnl We might have configuration options to:
-dnl * allow non-standard string concatenation (use libF77 s_catow.o,
-dnl   not s_cat.o)
 dnl * change unit preconnexion in libI77/err.c (f_init.c)
 dnl * -DALWAYS_FLUSH in libI77
 dnl * -DOMIT_BLANK_CC in libI77