From a6863e25381bb2a7b858f01296d2957506b1709d Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 10 Oct 2000 23:50:39 +0000 Subject: Makefile.am (LIBSUPCXX_INCLUDES): Adjust. 2000-10-10 Benjamin Kosnik * Makefile.am (LIBSUPCXX_INCLUDES): Adjust. * libsupc++/include: Remove * libsupc++/include/*: Move to ... * libsupc++: Here. * libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers. (glibcppinstalldir): New. * src/Makefile.am (c_base_headers): New. (c_shadow_headers): New (c_headers): New. (myinstallheaders): Correct install issues. * src/Makefile.in: Regenerate. * Makefile.am (CSHADOW_INCLUDES): Simplify. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir. * aclocal.m4: Regenerate. * mkcheck.in (SRC_DIR): Use it. * include/bits/std_stdexcept.h: And here. * include/bits/std_ios.h: Change std_exception.h to exception. * src/locale.cc: And here. * src/locale-inst.cc: And here. * include/bits/valarray_array.h: And here. * include/bits/stl_alloc.h: And here. * include/bits/stl_algobase.h: And here. * include/bits/pthread_allocimpl.h: And here. * include/bits/stl_construct.h: Change to std_new.h to new. * include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo. * src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES. (headers): Remove duplicated headers. (std_headers): And here. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove. * libsupc++/Makefile.in: Regenerate. * Makefile.am (LIBSUPCXX_INCLUDES): Add here. (AM_MAKEFLAGS): And here. * Makefile.in: Regenerate. * include/bits/std_typeinfo.h: Remove. * include/bits/std_new.h: Remove * include/bits/std_exception.h: Remove. * std/new: Remove. * std/typeinfo: Remove. * std/exception: Remove. * libio/_G_config.h (__need_ptrdiff_t): Add. * libsupc++/include/new: Change stddef.h to cstddef. * libsupc++/tinfo.h: Change limits.h to climits. * libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this renders the file uncompilable. Add copyright. * include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std namespace, as it is a fundamental type. From-SVN: r36833 --- libstdc++-v3/Makefile.am | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'libstdc++-v3/Makefile.am') diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 7803b79f4c2..530ccc36fd1 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -53,7 +53,12 @@ CONFIG_CXXFLAGS = \ # Root level of the include sources. -GLIBCPP_INCLUDES = $(top_srcdir)/include +GLIBCPP_INCLUDE_DIR = $(top_srcdir)/include + +# Can either use include/c or include/c_std to grab "C" headers. This +# variable is set to the include directory currently in use. +C_INCLUDE_DIR = $(GLIBCPP_INCLUDE_DIR)/@c_include_dir@ + # Passed down for cross compilers, canadian crosses. TOPLEVEL_INCLUDES = -I$(includedir) @@ -67,15 +72,12 @@ else LIBIO_INCLUDES = -I$(top_srcdir)/libio endif -# XXX may need to add this in later to enabled shadow header includes +LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++ + +# XXX May need to add this in later to enabled shadow header includes # -I$(top_builddir)/cshadow -if GLIBCPP_USE_CSHADOW CSHADOW_INCLUDES = \ - -I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c_std -else -CSHADOW_INCLUDES = \ - -I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c -endif + -I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR) # Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck" @@ -176,9 +178,10 @@ AM_MAKEFLAGS = \ "OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" \ "WARN_CXXFLAGS=$(WARN_CXXFLAGS)" \ "CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" \ - "GLIBCPP_INCLUDES=$(GLIBCPP_INCLUDES)" \ + "GLIBCPP_INCLUDE_DIR=$(GLIBCPP_INCLUDE_DIR)" \ + "C_INCLUDE_DIR=$(C_INCLUDE_DIR)" \ "TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" \ "LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" \ "LIBIO_INCLUDES=$(LIBIO_INCLUDES)" \ - "CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" - + "CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" \ + "LIBSUPCXX_INCLUDES=$(LIBSUPCXX_INCLUDES)" -- cgit v1.2.1