Commit 239a3da0 by Alexandre Petit-Bianco Committed by Benjamin Kosnik

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
parent a767e383
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> 2000-12-05 Benjamin Kosnik <bkoz@haight.redhat.com>
* acinclude.m4 (EXTRA_CXX_FLAGS): And here. * acinclude.m4 (EXTRA_CXX_FLAGS): And here.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## 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 AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
...@@ -318,8 +318,15 @@ wstring-inst.lo: string-inst.cc ...@@ -318,8 +318,15 @@ wstring-inst.lo: string-inst.cc
# Alexandre put this in here for some libtool-related reason. # Alexandre put this in here for some libtool-related reason.
all: libstdc++.INC all: libstdc++.INC
libstdc++.INC: Makefile 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 # 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 # modified in a per-library or per-sub-library way. Need to manually
......
...@@ -583,7 +583,15 @@ wstring-inst.lo: string-inst.cc ...@@ -583,7 +583,15 @@ wstring-inst.lo: string-inst.cc
# Alexandre put this in here for some libtool-related reason. # Alexandre put this in here for some libtool-related reason.
all: libstdc++.INC all: libstdc++.INC
libstdc++.INC: Makefile 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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment