aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-29 00:32:49 +0000
committerljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-29 00:32:49 +0000
commite4cedf550c4007e714c901d12e75396ae1293f37 (patch)
tree0d2ac3468755e55674797a775ccdb58032014eb2 /libstdc++-v3
parent1285e5f709fdad66b767def76d78d873bd0dbe97 (diff)
* include/Makefile.am: Use toplevel_srcdir to refer to src files
outside this component. * include/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45248 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/Makefile.am8
-rw-r--r--libstdc++-v3/include/Makefile.in6
3 files changed, 13 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0c411a15f7b..10e76175daa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-28 Loren J. Rittle <ljrittle@acm.org>
+
+ * include/Makefile.am: Use toplevel_srcdir to refer to src files
+ outside this component.
+ * include/Makefile.in: Regenerate.
+
2001-08-27 Benjamin Kosnik <bkoz@redhat.com>
* config/locale/c_locale_gnu.cc: Move facet info to separate files...
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 760fa6e30c9..dfd1215e860 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
-## $Id: Makefile.am,v 1.7 2001/08/14 08:42:19 bkoz Exp $
+## $Id: Makefile.am,v 1.8 2001/08/28 06:19:33 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
@@ -364,18 +364,18 @@ stamp-thread: ${thread_headers} ${thread_builddir}
${thread_builddir}/gthr.h:
sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
- < ${glibcpp_srcdir}/../gcc/gthr.h > $@
+ < ${toplevel_srcdir}/gcc/gthr.h > $@
${thread_builddir}/gthr-single.h:
sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
- < ${glibcpp_srcdir}/../gcc/gthr-single.h > $@
+ < ${toplevel_srcdir}/gcc/gthr-single.h > $@
${thread_builddir}/gthr-default.h:
sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
- < ${glibcpp_srcdir}/../gcc/${glibcpp_thread_h} > $@
+ < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
# One big happy istallation: just copy everything from the build to the
# install tree (except for the build stamps).
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 5eedc43ec64..e025474bcdb 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -385,18 +385,18 @@ stamp-thread: ${thread_headers} ${thread_builddir}
${thread_builddir}/gthr.h:
sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
- < ${glibcpp_srcdir}/../gcc/gthr.h > $@
+ < ${toplevel_srcdir}/gcc/gthr.h > $@
${thread_builddir}/gthr-single.h:
sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
- < ${glibcpp_srcdir}/../gcc/gthr-single.h > $@
+ < ${toplevel_srcdir}/gcc/gthr-single.h > $@
${thread_builddir}/gthr-default.h:
sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
- < ${glibcpp_srcdir}/../gcc/${glibcpp_thread_h} > $@
+ < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
install-data-local:
for file in `find . ! -name stamp-\* ! -name Makefile -print`; do \
installFile=${gxx_include_dir}/$${file} ;\