aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2000-08-16 18:36:57 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2000-08-16 18:36:57 +0000
commit7d7aced2884786d16198777c9909cfa280702d96 (patch)
tree29abd4ce565f0c7f6e8f920bedd5811003f732df /libstdc++-v3
parentc9635443f86153fb6a062476c7107df1d3ff4e39 (diff)
downloadgcc-7d7aced2884786d16198777c9909cfa280702d96.zip
gcc-7d7aced2884786d16198777c9909cfa280702d96.tar.gz
gcc-7d7aced2884786d16198777c9909cfa280702d96.tar.bz2
Makefile.am (libstdc++.INC): Renamed from INCLUDES.
* src/Makefile.am (libstdc++.INC): Renamed from INCLUDES. * src/Makefile.in: Regenerate. From-SVN: r35751
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/Makefile.am14
-rw-r--r--libstdc++-v3/src/Makefile.in12
3 files changed, 18 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3fe296f..6b60a5a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-16 Alexandre Oliva <aoliva@redhat.com>
+
+ * src/Makefile.am (libstdc++.INC): Renamed from INCLUDES.
+ * src/Makefile.in: Regenerate.
+
2000-08-15 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* bits/codecvt.h: New file.
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index e1950aa..263bcbe 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 216d265..a55cc0c 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.