Makefile.am (INCLUDES): Put $(CSHADOW_INCLUDES) before $(top_srcdir)

2000-08-22  Brent Verner <brent@rcfile.org>

	* src/Makefile.am (INCLUDES): Put $(CSHADOW_INCLUDES) before
	$(top_srcdir)
	* src/Makefile.in: Regenerate.

From-SVN: r35877

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f66ac57ddfbaa73c7fa46f44bf70491853e58e88..50d7d84a8c1292bdab9338e972398dded1273b5e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-22  Brent Verner <brent@rcfile.org>
+
+       * src/Makefile.am (INCLUDES): Put $(CSHADOW_INCLUDES) before
+       $(top_srcdir)
+       * src/Makefile.in: Regenerate.
+       
 2000-08-21  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
        * bits/codecvt.h: Implement codecvt<wchar_t, char, mbstate_t>. Fix

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 263bcbe2cfc2da23212fbc268f9135a2fd595210..47a5877421999bca7f92cfc938166cd875ddd794 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.27 2000/08/16 04:11:29 bkoz Exp $
+## $Id: Makefile.am,v 1.28 2000/08/16 18:36:57 aoliva Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -82,9 +82,8 @@ CONFIG_INCLUDES = \
        -I$(top_srcdir)/@ctype_include_dir@
 
 INCLUDES = \
-       -D_GNU_SOURCE -nostdinc++ -I$(top_srcdir) \
-       $(CSHADOW_INCLUDES) $(LIBIO_INCLUDES) \
-       $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES) 
+       -D_GNU_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) -I$(top_srcdir) \
+        $(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)      
 
 
 # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index a55cc0c219bc4fcd6a2a2a7b5e16c862611aa094..a63a6516a8523c90e10dc20dacba28aa35d0d20f 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -142,7 +142,9 @@ TOPLEVEL_INCLUDES = -I$(includedir)
 
 CONFIG_INCLUDES =      -I$(top_srcdir)/@cpu_include_dir@       -I$(top_srcdir)/@ctype_include_dir@
 
-INCLUDES = -D_GNU_SOURCE -nostdinc++ -I$(top_srcdir) $(CSHADOW_INCLUDES) $(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)
+
+INCLUDES =     -D_GNU_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) -I$(top_srcdir)    $(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)      
+
 
 # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,
 # things like -O2 passed down from the toplevel can be overridden by