diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-28 03:20:36 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-28 03:20:36 +0000 |
| commit | 49bf30f4562bc226f3505f198d09a5cdc3ca154b (patch) | |
| tree | dc192b8ecff2e02d0c91c72e2cfa3433f9b8b614 /libstdc++-v3/libio | |
| parent | f629e84eea9765c19fe486ccfa81349d09763e1a (diff) | |
2001-02-27 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/1886
* include/bits/basic_file.h: Include basic_file_model.h.
* config/c_io_libio.cc: Move to...
* config/basic_file_libio.cc: Here.
* config/basic_file_libio.h: New file.
* config/c_io_stdio.cc: Move to...
* config/basic_file_stdio.cc: Here.
* config/basic_file_stdio.h: New file.
* config/c_io_libio.h: Tweak.
* config/c_io_stdio.h: Tweak.
* src/Makefile.am (build_headers): Add basic_file_model.h.
(sources): Add basic_file.cc, remove c++io.cc.
* src/Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Add support for
basic_file_model.h and basic_file.cc.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* testsuite/27_io/filebuf.cc (test05): Add regression.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40108 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libio')
| -rw-r--r-- | libstdc++-v3/libio/Makefile.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 3d4f9bbdcf7..c93e0e0cfc4 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -113,7 +113,7 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = 1.3 cygnus mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la +@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES @@ -125,21 +125,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ -INCLUDES = \ - -nostdinc++ \ - -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \ - $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) -libio_headers = \ - libio.h libioP.h iolibio.h +libio_headers = libio.h libioP.h iolibio.h -@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\ -@GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \ -@GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c +@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = -@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\ -@GLIBCPP_NEED_WLIBIO_TRUE@ wfiledoalloc.c wfileops.c wgenops.c iofwide.c +@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = EXTRA_DIST = iostreamP.h |