diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-17 01:04:02 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-17 01:04:02 +0000 |
| commit | 7fdc2989844779a0b97c7ae898f80a634d59d06c (patch) | |
| tree | 075de064be2bf9a733ebd635eb911486e0bdffc2 /libstdc++-v3/libio | |
| parent | 5b52da0ea6c4d04a79890ab93dbde84085b54561 (diff) | |
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Make
--enable-cstdio=stdio the default. Disable wide character support
in that event.
* configure.in: Move GLIBCPP_ENABLE_C_MBCHAR after
(GLIBCPP_ENABLE_CSTDIO).
* config/c_io_stdio.h: Don't include <libio.h>, don't define
__c_wfile_type.
* aclocal.m4: Regenerated.
* configure: Likewise.
* Makefile.in: Likewise.
* libio/Makefile.in: Likewise.
* libmath/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* src/Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37509 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libio')
| -rw-r--r-- | libstdc++-v3/libio/Makefile.in | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index ba5221f85a3..daf5ca5bfb4 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -122,24 +122,15 @@ 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_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_FALSE@LIBIO_WSRCS = \ +@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 = wfiledoalloc.c wfileops.c wgenops.c iofwide.c +@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = EXTRA_DIST = iostreamP.h @@ -193,7 +184,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(libio_la_SOURCES) OBJECTS = $(libio_la_OBJECTS) @@ -302,7 +293,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ |