aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Petit-Bianco <apbianco@cygnus.com>2000-12-10 20:51:22 +0000
committerAlexandre Petit-Bianco <apbianco@gcc.gnu.org>2000-12-10 12:51:22 -0800
commit09314637fc1313f6c70b7fc26ede8a22ac24e756 (patch)
treeb3f43e4d44512ceef00adb6977e28abcc72533da
parent8000caee88af66730c50aa91dab4e886df972e43 (diff)
downloadgcc-09314637fc1313f6c70b7fc26ede8a22ac24e756.zip
gcc-09314637fc1313f6c70b7fc26ede8a22ac24e756.tar.gz
gcc-09314637fc1313f6c70b7fc26ede8a22ac24e756.tar.bz2
Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include 2000-11-12 hunk.
2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com> * src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include 2000-11-12 hunk. * src/Makefile.in: Rebuilt. From-SVN: r38178
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/src/Makefile.am4
-rw-r--r--libstdc++-v3/src/Makefile.in2
3 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ffab043..578402d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com>
+
+ * src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include
+ 2000-11-12 hunk.
+ * src/Makefile.in: Rebuilt.
+
2000-12-09 Jason Merrill <jason@redhat.com>
* testsuite/20_util/auto_ptr.cc (test07): Remove test that tries
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 9c4e346..0f86e26 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.55 2000/11/30 23:44:32 gdr Exp $
+## $Id: Makefile.am,v 1.56 2000/12/06 03:05:12 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
@@ -326,7 +326,7 @@ libstdc++.INC: Makefile
mv tmp-$@ $@
tmp-libstdc++.INC: Makefile
- echo -I$(top_builddir) $(INCLUDES) > $@
+ echo $(INCLUDES) > $@
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
# modified in a per-library or per-sub-library way. Need to manually
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index f2e35fc..5105ed9 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -688,7 +688,7 @@ libstdc++.INC: Makefile
mv tmp-$@ $@
tmp-libstdc++.INC: Makefile
- echo -I$(top_builddir) $(INCLUDES) > $@
+ echo $(INCLUDES) > $@
# 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.