2000-12-05 Alexandre Petit-Bianco <apbianco@redhat.com>

	* src/Makefile.am (libstdc++.INC): Revert for libjava builds.
	* src/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38059 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf6fb6f..c3227ce 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-05  Alexandre Petit-Bianco  <apbianco@redhat.com>
+
+       * src/Makefile.am (libstdc++.INC): Revert for libjava builds.
+       * src/Makefile.in: Regenerate.
+       
 2000-12-05  Benjamin Kosnik  <bkoz@haight.redhat.com>
 
        * acinclude.m4 (EXTRA_CXX_FLAGS): And here.

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 3eb2e9e..9c4e346 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.54 2000/11/29 21:30:30 bkoz Exp $
+## $Id: Makefile.am,v 1.55 2000/11/30 23:44:32 gdr Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -318,8 +318,15 @@ wstring-inst.lo: string-inst.cc
 # Alexandre put this in here for some libtool-related reason.
 all: libstdc++.INC
 libstdc++.INC: Makefile
-       echo $(INCLUDES) > $@
-
+       $(MAKE) \
+       top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \
+       top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \
+       tmp-$@
+       -rm -f $@
+       mv tmp-$@ $@
+
+tmp-libstdc++.INC: Makefile
+       echo -I$(top_builddir) $(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 a748c57..8d9f2b9 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -583,7 +583,15 @@ wstring-inst.lo: string-inst.cc
 # Alexandre put this in here for some libtool-related reason.
 all: libstdc++.INC
 libstdc++.INC: Makefile
-       echo $(INCLUDES) > $@
+       $(MAKE) \
+       top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \
+       top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \
+       tmp-$@
+       -rm -f $@
+       mv tmp-$@ $@
+
+tmp-libstdc++.INC: Makefile
+       echo -I$(top_builddir) $(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.