Changes in directory gcc-3.4/libstdc++-v3/include:
Makefile.am updated: 1.2 -> 1.3
Makefile.in updated: 1.2 -> 1.3
---
Log message:
Commit of merge from September 24, 2003 of mainline GCC. This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.
---
Diffs of the changes: (+26 -27)
Index: gcc-3.4/libstdc++-v3/include/Makefile.am
diff -u gcc-3.4/libstdc++-v3/include/Makefile.am:1.2 gcc-3.4/libstdc++-v3/include/Makefile.am:1.3
--- gcc-3.4/libstdc++-v3/include/Makefile.am:1.2 Fri Jan 9 10:54:35 2004
+++ gcc-3.4/libstdc++-v3/include/Makefile.am Thu Feb 5 10:05:49 2004
@@ -225,7 +225,7 @@
# This is the common subset of files that all three "C" header models use.
-c_base_srcdir = @C_INCLUDE_DIR@
+c_base_srcdir = $(C_INCLUDE_DIR)
c_base_builddir = .
c_base_headers = \
${c_base_srcdir}/std_cassert.h \
@@ -304,19 +304,19 @@
c_compatibility_headers_extra =
endif
-host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
host_builddir = ./${host_alias}/bits
host_headers = \
${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \
- ${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
- ${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h
+ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
+ ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files.
host_headers_noinst = \
- ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
+ ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H)
# These host_headers_extra files are all built with ad hoc naming rules.
host_headers_extra = \
@@ -441,13 +441,13 @@
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host
@@ -464,7 +464,6 @@
echo "#endif // _CXXCONFIG_" >>$@
# Host includes for threads
-glibcxx_thread_h = @glibcxx_thread_h@
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
Index: gcc-3.4/libstdc++-v3/include/Makefile.in
diff -u gcc-3.4/libstdc++-v3/include/Makefile.in:1.2 gcc-3.4/libstdc++-v3/include/Makefile.in:1.3
--- gcc-3.4/libstdc++-v3/include/Makefile.in:1.2 Fri Jan 9 10:54:35 2004
+++ gcc-3.4/libstdc++-v3/include/Makefile.in Thu Feb 5 10:05:49 2004
@@ -166,8 +166,6 @@
glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@
glibcxx_srcdir = @glibcxx_srcdir@
-
-# Host includes for threads
glibcxx_thread_h = @glibcxx_thread_h@
glibcxx_toolexecdir = @glibcxx_toolexecdir@
glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
@@ -427,7 +425,7 @@
# This is the common subset of files that all three "C" header models use.
-c_base_srcdir = @C_INCLUDE_DIR@
+c_base_srcdir = $(C_INCLUDE_DIR)
c_base_builddir = .
c_base_headers = \
${c_base_srcdir}/std_cassert.h \
@@ -503,20 +501,20 @@
@GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE at c_compatibility_headers_extra = ${c_compatibility_headers}
-host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
host_builddir = ./${host_alias}/bits
host_headers = \
${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \
- ${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
- ${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h
+ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
+ ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files.
host_headers_noinst = \
- ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
+ ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H)
# These host_headers_extra files are all built with ad hoc naming rules.
@@ -560,6 +558,8 @@
${thread_host_headers} \
${pch_build}
+
+# Host includes for threads
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
# By adding these files here, automake will remove them for 'make clean'
@@ -796,13 +796,13 @@
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host