Makefile.am (INCLUDES): Add toplevel include directory.

2000-10-08   Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* libsupc++/Makefile.am (INCLUDES): Add toplevel include directory.
	(INCLUDES): Add glibcpp_includedir.
	* libsupc++/Makefile.in: Regenerate.

	* acinclude.m4 (GLIBCPP_CHECK_OS): Link to os_defines.h.
	* aclocal.m4: Regenerate.
	* config/os/*/bits/os_defintes: Adjust copyright dates.

From-SVN: r36798

libstdc++-v3/ChangeLog

+2000-10-08   Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	* libsupc++/Makefile.am (INCLUDES): Add toplevel include directory.
+	(INCLUDES): Add glibcpp_includedir.
+	* libsupc++/Makefile.in: Regenerate.
+
+	* acinclude.m4 (GLIBCPP_CHECK_OS): Link to os_defines.h.
+	* aclocal.m4: Regenerate.
+	* config/os/*/bits/os_defintes: Adjust copyright dates.
+	
 2000-10-08  Phil Edwards  <pme@sources.redhat.com>
 
 	* include/bits/c++config:  Include <bits/os_defines.h>

libstdc++-v3/acinclude.m4

@@ -760,6 +760,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [
         ;;
     esac
     AC_MSG_RESULT($os_include_dir)
+    AC_LINK_FILES($os_include_dir/bits/os_defines.h, bits/os_defines.h)
 ])
 
 

libstdc++-v3/aclocal.m4

@@ -772,6 +772,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [
         ;;
     esac
     AC_MSG_RESULT($os_include_dir)
+    AC_LINK_FILES($os_include_dir/bits/os_defines.h, bits/os_defines.h)
 ])
 
 

libstdc++-v3/config/os/aix/bits/os_defines.h

 // Specific definitions for AIX  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/bsd/bits/os_defines.h

 // Specific definitions for BSD  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/generic/bits/os_defines.h

 // Specific definitions for generic platforms  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/gnu-linux/bits/os_defines.h

 // Specific definitions for GNU/Linux  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/irix/bits/os_defines.h

 // Specific definitions for IRIX  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/newlib/bits/os_defines.h

 // Specific definitions for newlib  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/solaris/solaris2.5/bits/os_defines.h

 // Specific definitions for Solaris 2.5  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/solaris/solaris2.6/bits/os_defines.h

 // Specific definitions for Solaris 2.6  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h

 // Specific definitions for Solaris 7,8  -*- C++ -*-
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the

libstdc++-v3/libio/Makefile.in

@@ -401,16 +401,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-#COMPILE = \
-#	$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) \
-#	$(AM_CFLAGS) 
-
-#LTCOMPILE = \
-#	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
-#	$(AM_CPPFLAGS) \$(CPPFLAGS)  $(CFLAGS) $(AM_CFLAGS)
-
-#LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -o $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

libstdc++-v3/libsupc++/Makefile.am

@@ -41,9 +41,12 @@ toolexeclib_LTLIBRARIES = libsupc++.la
 # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
 noinst_LTLIBRARIES = libsupc++convenience.la
 
+# Root level of the include sources.
+glibcpp_includedir = $(top_srcdir)/include
 
 INCLUDES = \
-	-I$(top_srcdir)/../gcc -I$(top_srcdir)/libsupc++/include \
+	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
+	-I$(top_srcdir)/libsupc++/include -I$(glibcpp_includedir) \
 	$(CONFIG_INCLUDES)
 
 headers = \

libstdc++-v3/libsupc++/Makefile.in

@@ -113,7 +113,10 @@ toolexeclib_LTLIBRARIES = libsupc++.la
 # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
 noinst_LTLIBRARIES = libsupc++convenience.la
 
-INCLUDES =  	-I$(top_srcdir)/../gcc -I$(top_srcdir)/libsupc++/include 	$(CONFIG_INCLUDES)
+# Root level of the include sources.
+glibcpp_includedir = $(top_srcdir)/include
+
+INCLUDES =  	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include 	-I$(top_srcdir)/libsupc++/include -I$(glibcpp_includedir) 	$(CONFIG_INCLUDES)
 
 
 headers =  	include/cxxabi.h 	include/exception 	include/new 	include/new.h 	include/typeinfo