diff options
author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-16 01:44:03 +0000 |
---|---|---|
committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-16 01:44:03 +0000 |
commit | b9f81c863bd45c20aabaa9668e6ddf0e63516df8 (patch) | |
tree | 4252d54af0e0ce0c1b1a4ee574c2caa7196ebe09 /libstdc++-v3/libio | |
parent | e6ad417572ba4de6ca183f18142ccc4243a98f2b (diff) | |
download | gcc-b9f81c863bd45c20aabaa9668e6ddf0e63516df8.tar.gz |
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Substitute libio_la.
* src/Makefile.am (libstdc___la_LIBADD): Use it.
* aclocal.m4: Regenerated.
* configure: Likewise.
* Makefile.in: Likewise.
* libio/Makefile.in: Likewise.
* libmath/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* src/Makfile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37491 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libio')
-rw-r--r-- | libstdc++-v3/libio/Makefile.in | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 5f83aa97cee..ba5221f85a3 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -106,6 +106,7 @@ glibcpp_basedir = @glibcpp_basedir@ gxx_include_dir = @gxx_include_dir@ ifGNUmake = @ifGNUmake@ libinst_wstring_la = @libinst_wstring_la@ +libio_la = @libio_la@ libstdcxx_interface = @libstdcxx_interface@ AUTOMAKE_OPTIONS = 1.3 cygnus @@ -121,15 +122,24 @@ 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 = 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 = +@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 = \ EXTRA_DIST = iostreamP.h @@ -183,7 +193,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libio_la_SOURCES) OBJECTS = $(libio_la_OBJECTS) @@ -292,7 +302,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 $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ |