diff options
| author | Alexandre Petit-Bianco <apbianco@redhat.com> | 2000-12-05 19:05:12 -0800 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-12-06 03:05:12 +0000 |
| commit | 239a3da0939f86f7d5b455d609e01480d9a566e7 (patch) | |
| tree | 5c2e3f259edde38cdb3de1c7ae8fca016d38bbfd /libstdc++-v3 | |
| parent | a767e3837fd25953823b3c364ea0c0b40e1053e0 (diff) | |
| download | gcc-239a3da0939f86f7d5b455d609e01480d9a566e7.zip gcc-239a3da0939f86f7d5b455d609e01480d9a566e7.tar.gz gcc-239a3da0939f86f7d5b455d609e01480d9a566e7.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 13 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 10 |
3 files changed, 24 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf6fb6f..c3227ce 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 3eb2e9e..9c4e346 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 a748c57..8d9f2b9 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. |