diff options
author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2007-01-17 20:44:00 +0100 |
---|---|---|
committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2007-01-17 19:44:00 +0000 |
commit | 0dce3ca161fa6664c8505cfe0718a9dbccb8765c (patch) | |
tree | acb8b6ff735e7961042f7c90dac13e2947fc3c83 /libgfortran/Makefile.am | |
parent | e7fd0be47b7afeb96031c3e6ba9ff0eddf7a848a (diff) | |
download | gcc-0dce3ca161fa6664c8505cfe0718a9dbccb8765c.tar.gz |
re PR libfortran/27107 (Make dependency on io/io.h broken)
PR libfortran/27107
* runtime/environ.c: Don't include io/io.h.
* runtime/string.c: Don't include io/io.h.
(compare0): Add cast to avoid warning.
* runtime/error.c: Don't include io/io.h.
(st_printf): Move to io/unix.c.
* intrinsics/flush.c: Delete, contents moved to io/intrinsics.c.
* intrinsics/fget.c: Likewise.
* intrinsics/ftell.c: Likewise.
* intrinsics/tty.c: Likewise.
* libgfortran.h (DEFAULT_RECL, notification_std,
get_unformatted_convert, IOPARM_*, st_parameter_common, unit_convert,
DEFAULT_TEMPDIR): New declarations.
* io/io.h (DEFAULT_RECL, notification_std, get_unformatted_convert,
IOPARM_*, st_parameter_common, unit_convert, DEFAULT_TEMPDIR):
Move to libgfortran.h.
* io/unix.c: Add io/unix.h content.
(st_printf): New function.
* io/intrinsics.c: New file.
* io/unix.h: Remove, contents moved into unix.c.
* libtool-version: Update library version to 3.0.0.
* configure.ac: Update library version to 0.3.
* Makefile.am (intrinsics/fget.c, intrinsics/flush.c,
intrinsics/ftell.c, intrinsics/tty.c, libgfortran.h): Remove targets.
* Makefile.in: Regenerate.
* configure: Regenerate.
From-SVN: r120869
Diffstat (limited to 'libgfortran/Makefile.am')
-rw-r--r-- | libgfortran/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index b6bf05b2dc6..c1cb3ac19dc 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -25,6 +25,7 @@ io/close.c \ io/file_pos.c \ io/format.c \ io/inquire.c \ +io/intrinsics.c \ io/list_read.c \ io/lock.c \ io/open.c \ @@ -56,10 +57,7 @@ intrinsics/eoshift0.c \ intrinsics/eoshift2.c \ intrinsics/etime.c \ intrinsics/exit.c \ -intrinsics/fget.c \ -intrinsics/flush.c \ intrinsics/fnum.c \ -intrinsics/ftell.c \ intrinsics/gerror.c \ intrinsics/getcwd.c \ intrinsics/getlog.c \ @@ -92,7 +90,6 @@ intrinsics/symlnk.c \ intrinsics/system_clock.c \ intrinsics/time.c \ intrinsics/transpose_generic.c \ -intrinsics/tty.c \ intrinsics/umask.c \ intrinsics/unlink.c \ intrinsics/unpack_generic.c \ @@ -109,8 +106,7 @@ runtime/memory.c \ runtime/pause.c \ runtime/stop.c \ runtime/string.c \ -runtime/select.c \ -libgfortran.h +runtime/select.c i_all_c= \ generated/all_l4.c \ |