diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3fe296f5eca..6b60a5ae4e0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2000-08-16 Alexandre Oliva + + * src/Makefile.am (libstdc++.INC): Renamed from INCLUDES. + * src/Makefile.in: Regenerate. + 2000-08-15 Benjamin Kosnik * bits/codecvt.h: New file. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index e1950aa711e..263bcbe2cfc 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.26 2000/08/15 07:42:36 aoliva Exp $ +## $Id: Makefile.am,v 1.27 2000/08/16 04:11:29 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -314,14 +314,14 @@ wstring-inst.o: string-inst.cc wstring-inst.lo: string-inst.cc $(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ -all: INCLUDES -INCLUDES: Makefile +all: libstdc++.INC +libstdc++.INC: Makefile $(MAKE) \ top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \ top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \ - tmp-INCLUDES - -rm -f INCLUDES - mv tmp-INCLUDES INCLUDES + tmp-$@ + -rm -f $@ + mv tmp-$@ $@ -tmp-INCLUDES: Makefile +tmp-libstdc++.INC: Makefile echo -I$(top_builddir) $(INCLUDES) > $@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 216d265a71b..a55cc0c219b 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -515,16 +515,16 @@ wstring-inst.o: string-inst.cc wstring-inst.lo: string-inst.cc $(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ -all: INCLUDES -INCLUDES: Makefile +all: libstdc++.INC +libstdc++.INC: Makefile $(MAKE) \ top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \ top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \ - tmp-INCLUDES - -rm -f INCLUDES - mv tmp-INCLUDES INCLUDES + tmp-$@ + -rm -f $@ + mv tmp-$@ $@ -tmp-INCLUDES: Makefile +tmp-libstdc++.INC: Makefile echo -I$(top_builddir) $(INCLUDES) > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables.