diff options
author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-21 22:52:51 +0000 |
---|---|---|
committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-21 22:52:51 +0000 |
commit | 7fb56759a40d74bb6734a22b4f433d6f12328fdd (patch) | |
tree | 0dfad2ca73e4a58641a63bfffe07273ee77b0d63 /libstdc++-v3/libio | |
parent | fce7b5e20b92792e881f298357b4acd9ea2ad4ee (diff) | |
download | gcc-7fb56759a40d74bb6734a22b4f433d6f12328fdd.tar.gz |
2000-12-21 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Change GLIBCPP_ENABLE_SHADOW to
GLIBCPP_ENABLE_CHEADERS.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to
ENABLE_CHEADERS. C_INCLUDE_DIR defaults to c_std from c.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* include/c: Move to ...
* include/c_std: ...here.
* include/c_std: Move to ...
* include/c_shadow: ...here.
* include/c: Repopulate, with simple headers.
* docs/html/configopts.html: Adjust docs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38432 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 0c3f6726b88..a80ad10e4c7 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -111,7 +111,7 @@ libio_la = @libio_la@ libstdcxx_interface = @libstdcxx_interface@ AUTOMAKE_OPTIONS = 1.3 cygnus -@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 @@ -123,21 +123,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 iofclose.c \ -@GLIBCPP_NEED_LIBIO_TRUE@ iofopen.c stdio.c +@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c stdio.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 |