diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-13 16:47:56 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-13 16:47:56 +0000 |
| commit | db42028b69ab668886c7b77ac602eeb473892a6b (patch) | |
| tree | 6efdb62e23ea1b74c2fa5ca8d8984cbaddc5a18a /libstdc++-v3/libio | |
| parent | fd2ce42712717e13ab2dd0a9568284546698d902 (diff) | |
| download | gcc-db42028b69ab668886c7b77ac602eeb473892a6b.tar.gz | |
2001-07-13 Stephen M. Webb <stephen@bregmasoft.com>
Loren J. Rittle <ljrittle@acm.org>
Phil Edwards <pme@sources.redhat.com>
* include/Makefile.am: New file encapsulating header generation rules.
* Makefile.am (SUBDIRS): Prepend 'include' directory.
* acinclude.m4: Moved/removed rules for building various headers.
* configure.in (AC_OUTPUT): Add include/Makefile.
* mkc++config: Removed.
* testsuite_flags.in: Changed build-includes to match new scheme.
* mknumeric_limits: Likewise.
* libio/Makefile.am: Changed INCLUDES to maatch new header scheme.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* src/Makefile.am: Likewise; removed rules to build headers.
* libmath/mathconf.h: Changed #include'd header names to match.
* libmath/stubs.c: Likewise.
* src/gen-num-limits.cc: Likewise.
* configure: Regenerated.
* config.h.in: Regenerated.
* aclocal.m4: Regenerated.
* Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* libio/Makefile.in: Regenerated.
* libmath/Makefile.in: Regenerated.
* libsupc++/Makefile.in: Regenerated.
* src/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43985 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libio')
| -rw-r--r-- | libstdc++-v3/libio/Makefile.am | 9 | ||||
| -rw-r--r-- | libstdc++-v3/libio/Makefile.in | 34 |
2 files changed, 25 insertions, 18 deletions
diff --git a/libstdc++-v3/libio/Makefile.am b/libstdc++-v3/libio/Makefile.am index 3d81530a2ff..dbba6ff51d7 100644 --- a/libstdc++-v3/libio/Makefile.am +++ b/libstdc++-v3/libio/Makefile.am @@ -32,18 +32,13 @@ noinst_LTLIBRARIES = endif # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES -GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ -C_INCLUDE_DIR = @C_INCLUDE_DIR@ +GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ -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) + $(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) libio_headers = \ libio.h libioP.h iolibio.h diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index ac805d2bf42..53b9a869fa9 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -65,20 +65,28 @@ target_alias = @target_alias@ target_triplet = @target@ AR = @AR@ AS = @AS@ +ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@ +BASIC_FILE_H = @BASIC_FILE_H@ CC = @CC@ +CCODECVT_C = @CCODECVT_C@ +CLOCALE_H = @CLOCALE_H@ CPP = @CPP@ CSHADOW_FLAGS = @CSHADOW_FLAGS@ -CSTD_INCLUDES = @CSTD_INCLUDES@ +CSTDIO_H = @CSTDIO_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ +C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@ LIBMATHOBJS = @LIBMATHOBJS@ +LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBSTRINGOBJS = @LIBSTRINGOBJS@ +LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -88,6 +96,7 @@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@ +OS_INC_SRCDIR = @OS_INC_SRCDIR@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SECTION_FLAGS = @SECTION_FLAGS@ @@ -104,6 +113,7 @@ glibcpp_basedir = @glibcpp_basedir@ glibcpp_builddir = @glibcpp_builddir@ glibcpp_prefixdir = @glibcpp_prefixdir@ glibcpp_srcdir = @glibcpp_srcdir@ +glibcpp_thread_h = @glibcpp_thread_h@ glibcpp_toolexecdir = @glibcpp_toolexecdir@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -114,26 +124,28 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = 1.3 cygnus mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la +@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES -GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ -C_INCLUDE_DIR = @C_INCLUDE_DIR@ +GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ -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++ \ + $(GLIBCPP_INCLUDES) $(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 +@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_FALSE@LIBIO_SRCS = -@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c +@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 |