diff options
| author | Brent Verner <brent@rcfile.org> | 2000-08-22 17:22:38 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-08-22 17:22:38 +0000 |
| commit | f3342f7303ecb6651c628a3c7ed8873a6acd39bc (patch) | |
| tree | 16acd378d1e33f823f061f695ed1ce9ff9b035b4 | |
| parent | d061bc1e93f961c03cc6105d96540dd1a97adf72 (diff) | |
| download | gcc-f3342f7303ecb6651c628a3c7ed8873a6acd39bc.zip gcc-f3342f7303ecb6651c628a3c7ed8873a6acd39bc.tar.gz gcc-f3342f7303ecb6651c628a3c7ed8873a6acd39bc.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f66ac57..50d7d84 100644 --- 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 263bcbe..47a5877 100644 --- 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 a55cc0c..a63a651 100644 --- 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 |