From: Alexandre Petit-Bianco <apbianco@redhat.com>
Date: Wed, 6 Dec 2000 03:05:12 +0000 (-0800)
Subject: Makefile.am (libstdc++.INC): Revert for libjava builds.
X-Git-Tag: prereleases/libstdc++-2.92~2435
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=239a3da0939f86f7d5b455d609e01480d9a566e7;p=thirdparty%2Fgcc.git

Makefile.am (libstdc++.INC): Revert for libjava builds.


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

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

From-SVN: r38059
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf6fb6ffeab3..c3227ce03ef1 100644
--- 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 3eb2e9ecf4ea..9c4e34649bc0 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.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 a748c57512bc..8d9f2b93af5d 100644
--- 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.