From c55357682bb5e8c79b4ba3e969bcf8014f58a2cc Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 17 Jan 2002 07:18:33 +0000 Subject: [PATCH] Makefile.am (c_base_headers_rename): New. 2002-01-16 Benjamin Kosnik * include/Makefile.am (c_base_headers_rename): New. (c_base_headers_extra): New. (stamp-c_base): Modify. (install-data-local): Use both. * include/Makefile.in: Regenerate. * include/c/[cctype ciso646 cmath cstdarg cstdlib cerrno climits csetjmp cstddef cstring cwchar cassert cfloat clocale csignal cstdio ctime cwctype]: Move to.. * include/c/std_*: Here. * include/c_std/[cctype ciso646 cmath cstdarg cstdlib cerrno climits csetjmp cstddef cstring cwchar cassert cfloat clocale csignal cstdio ctime cwctype]: Move to.. * include/c_std/std_*: Here. Alexandre Oliva * include/Makefile.am (.PRECIOUS): Add rule. * include/Makefile.in: Regenerate. From-SVN: r48940 --- libstdc++-v3/ChangeLog | 22 ++- libstdc++-v3/include/Makefile.am | 136 ++++++++++------- libstdc++-v3/include/Makefile.in | 137 +++++++++++------- .../include/c/{cassert => std_cassert.h} | 0 .../include/c/{cctype => std_cctype.h} | 0 .../include/c/{cerrno => std_cerrno.h} | 0 .../include/c/{cfloat => std_cfloat.h} | 0 .../include/c/{ciso646 => std_ciso646.h} | 0 .../include/c/{climits => std_climits.h} | 0 .../include/c/{clocale => std_clocale.h} | 0 libstdc++-v3/include/c/{cmath => std_cmath.h} | 0 .../include/c/{csetjmp => std_csetjmp.h} | 0 .../include/c/{csignal => std_csignal.h} | 0 .../include/c/{cstdarg => std_cstdarg.h} | 0 .../include/c/{cstddef => std_cstddef.h} | 0 .../include/c/{cstdio => std_cstdio.h} | 0 .../include/c/{cstdlib => std_cstdlib.h} | 0 .../include/c/{cstring => std_cstring.h} | 0 libstdc++-v3/include/c/{ctime => std_ctime.h} | 0 .../include/c/{cwchar => std_cwchar.h} | 0 .../include/c/{cwctype => std_cwctype.h} | 0 .../include/c_std/{cassert => std_cassert.h} | 0 .../include/c_std/{cctype => std_cctype.h} | 0 .../include/c_std/{cerrno => std_cerrno.h} | 0 .../include/c_std/{cfloat => std_cfloat.h} | 0 .../include/c_std/{ciso646 => std_ciso646.h} | 0 .../include/c_std/{climits => std_climits.h} | 0 .../include/c_std/{clocale => std_clocale.h} | 0 .../include/c_std/{cmath => std_cmath.h} | 0 .../include/c_std/{csetjmp => std_csetjmp.h} | 0 .../include/c_std/{csignal => std_csignal.h} | 0 .../include/c_std/{cstdarg => std_cstdarg.h} | 0 .../include/c_std/{cstddef => std_cstddef.h} | 0 .../include/c_std/{cstdio => std_cstdio.h} | 0 .../include/c_std/{cstdlib => std_cstdlib.h} | 0 .../include/c_std/{cstring => std_cstring.h} | 0 .../include/c_std/{ctime => std_ctime.h} | 0 .../include/c_std/{cwchar => std_cwchar.h} | 0 .../include/c_std/{cwctype => std_cwctype.h} | 0 39 files changed, 194 insertions(+), 101 deletions(-) rename libstdc++-v3/include/c/{cassert => std_cassert.h} (100%) rename libstdc++-v3/include/c/{cctype => std_cctype.h} (100%) rename libstdc++-v3/include/c/{cerrno => std_cerrno.h} (100%) rename libstdc++-v3/include/c/{cfloat => std_cfloat.h} (100%) rename libstdc++-v3/include/c/{ciso646 => std_ciso646.h} (100%) rename libstdc++-v3/include/c/{climits => std_climits.h} (100%) rename libstdc++-v3/include/c/{clocale => std_clocale.h} (100%) rename libstdc++-v3/include/c/{cmath => std_cmath.h} (100%) rename libstdc++-v3/include/c/{csetjmp => std_csetjmp.h} (100%) rename libstdc++-v3/include/c/{csignal => std_csignal.h} (100%) rename libstdc++-v3/include/c/{cstdarg => std_cstdarg.h} (100%) rename libstdc++-v3/include/c/{cstddef => std_cstddef.h} (100%) rename libstdc++-v3/include/c/{cstdio => std_cstdio.h} (100%) rename libstdc++-v3/include/c/{cstdlib => std_cstdlib.h} (100%) rename libstdc++-v3/include/c/{cstring => std_cstring.h} (100%) rename libstdc++-v3/include/c/{ctime => std_ctime.h} (100%) rename libstdc++-v3/include/c/{cwchar => std_cwchar.h} (100%) rename libstdc++-v3/include/c/{cwctype => std_cwctype.h} (100%) rename libstdc++-v3/include/c_std/{cassert => std_cassert.h} (100%) rename libstdc++-v3/include/c_std/{cctype => std_cctype.h} (100%) rename libstdc++-v3/include/c_std/{cerrno => std_cerrno.h} (100%) rename libstdc++-v3/include/c_std/{cfloat => std_cfloat.h} (100%) rename libstdc++-v3/include/c_std/{ciso646 => std_ciso646.h} (100%) rename libstdc++-v3/include/c_std/{climits => std_climits.h} (100%) rename libstdc++-v3/include/c_std/{clocale => std_clocale.h} (100%) rename libstdc++-v3/include/c_std/{cmath => std_cmath.h} (100%) rename libstdc++-v3/include/c_std/{csetjmp => std_csetjmp.h} (100%) rename libstdc++-v3/include/c_std/{csignal => std_csignal.h} (100%) rename libstdc++-v3/include/c_std/{cstdarg => std_cstdarg.h} (100%) rename libstdc++-v3/include/c_std/{cstddef => std_cstddef.h} (100%) rename libstdc++-v3/include/c_std/{cstdio => std_cstdio.h} (100%) rename libstdc++-v3/include/c_std/{cstdlib => std_cstdlib.h} (100%) rename libstdc++-v3/include/c_std/{cstring => std_cstring.h} (100%) rename libstdc++-v3/include/c_std/{ctime => std_ctime.h} (100%) rename libstdc++-v3/include/c_std/{cwchar => std_cwchar.h} (100%) rename libstdc++-v3/include/c_std/{cwctype => std_cwctype.h} (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d2f7cf32605..15c4dd7636d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,26 @@ +2002-01-16 Benjamin Kosnik + + * include/Makefile.am (c_base_headers_rename): New. + (c_base_headers_extra): New. + (stamp-c_base): Modify. + (install-data-local): Use both. + * include/Makefile.in: Regenerate. + * include/c/[cctype ciso646 cmath cstdarg cstdlib cerrno climits + csetjmp cstddef cstring cwchar cassert cfloat clocale csignal + cstdio ctime cwctype]: Move to.. + * include/c/std_*: Here. + * include/c_std/[cctype ciso646 cmath cstdarg cstdlib cerrno climits + csetjmp cstddef cstring cwchar cassert cfloat clocale csignal + cstdio ctime cwctype]: Move to.. + * include/c_std/std_*: Here. + + Alexandre Oliva + * include/Makefile.am (.PRECIOUS): Add rule. + * include/Makefile.in: Regenerate. + 2002-01-16 Benjamin Kosnik Peter Schmid - + * include/bits/stl_iterator.h (reverse_iterator::_M_current): Deuglify, should be current. (back_insert_iterator::_M_container): Deuglify, should be container. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 08699d4ee5f..aa06323f0ae 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -162,25 +162,46 @@ ext_headers = \ c_base_srcdir = @C_INCLUDE_DIR@ c_base_builddir = ./ c_base_headers = \ - ${c_base_srcdir}/cassert \ - ${c_base_srcdir}/cctype \ - ${c_base_srcdir}/cerrno \ - ${c_base_srcdir}/cfloat \ - ${c_base_srcdir}/ciso646 \ - ${c_base_srcdir}/climits \ - ${c_base_srcdir}/clocale \ - ${c_base_srcdir}/cmath \ - ${c_base_srcdir}/csetjmp \ - ${c_base_srcdir}/csignal \ - ${c_base_srcdir}/cstdarg \ - ${c_base_srcdir}/cstddef \ - ${c_base_srcdir}/cstdio \ - ${c_base_srcdir}/cstdlib \ - ${c_base_srcdir}/cstring \ - ${c_base_srcdir}/ctime \ - ${c_base_srcdir}/cwchar \ - ${c_base_srcdir}/cwctype \ + ${c_base_srcdir}/std_cassert.h \ + ${c_base_srcdir}/std_cctype.h \ + ${c_base_srcdir}/std_cerrno.h \ + ${c_base_srcdir}/std_cfloat.h \ + ${c_base_srcdir}/std_ciso646.h \ + ${c_base_srcdir}/std_climits.h \ + ${c_base_srcdir}/std_clocale.h \ + ${c_base_srcdir}/std_cmath.h \ + ${c_base_srcdir}/std_csetjmp.h \ + ${c_base_srcdir}/std_csignal.h \ + ${c_base_srcdir}/std_cstdarg.h \ + ${c_base_srcdir}/std_cstddef.h \ + ${c_base_srcdir}/std_cstdio.h \ + ${c_base_srcdir}/std_cstdlib.h \ + ${c_base_srcdir}/std_cstring.h \ + ${c_base_srcdir}/std_ctime.h \ + ${c_base_srcdir}/std_cwchar.h \ + ${c_base_srcdir}/std_cwctype.h +# Some of the "C" headers need extra files. +c_base_headers_extra = \ ${c_base_srcdir}/cmath.tcc +c_base_headers_rename = \ + cassert \ + cctype \ + cerrno \ + cfloat \ + ciso646 \ + climits \ + clocale \ + cmath \ + csetjmp \ + csignal \ + cstdarg \ + cstddef \ + cstdio \ + cstdlib \ + cstring \ + ctime \ + cwchar \ + cwctype std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = ./ @@ -216,35 +237,35 @@ std_headers = \ ${std_srcdir}/std_vector.h # Renamed at build time. std_headers_rename = \ - ${std_builddir}/algorithm \ - ${std_builddir}/bitset \ - ${std_builddir}/complex \ - ${std_builddir}/deque \ - ${std_builddir}/fstream \ - ${std_builddir}/functional \ - ${std_builddir}/iomanip \ - ${std_builddir}/ios \ - ${std_builddir}/iosfwd \ - ${std_builddir}/iostream \ - ${std_builddir}/istream \ - ${std_builddir}/iterator \ - ${std_builddir}/limits \ - ${std_builddir}/list \ - ${std_builddir}/locale \ - ${std_builddir}/map \ - ${std_builddir}/memory \ - ${std_builddir}/numeric \ - ${std_builddir}/ostream \ + algorithm \ + bitset \ + complex \ + deque \ + fstream \ + functional \ + iomanip \ + ios \ + iosfwd \ + iostream \ + istream \ + iterator \ + limits \ + list \ + locale \ + map \ + memory \ + numeric \ + ostream \ ${std_builddir}/queue \ - ${std_builddir}/set \ - ${std_builddir}/sstream \ - ${std_builddir}/stack \ - ${std_builddir}/stdexcept \ - ${std_builddir}/streambuf \ - ${std_builddir}/string \ - ${std_builddir}/utility \ - ${std_builddir}/valarray \ - ${std_builddir}/vector + set \ + sstream \ + stack \ + stdexcept \ + streambuf \ + string \ + utility \ + valarray \ + vector target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits @@ -298,11 +319,15 @@ stamp-bits: ${bits_headers} (cd ${bits_builddir} && @LN_S@ $? . || true) ;\ echo `date` > stamp-bits -stamp-c_base: ${c_base_headers} +stamp-c_base: ${c_base_headers} ${c_base_headers_extra} @if [ ! -d "${c_base_builddir}" ]; then \ mkdir -p ${c_base_builddir} ;\ fi ;\ - (cd ${c_base_builddir} && @LN_S@ $? . || true) ;\ + (cd ${c_base_builddir} && for h in ${c_base_headers}; do \ + official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ + @LN_S@ $$h ./$${official_name} || true ;\ + done) ;\ + (cd ${c_base_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\ echo `date` > stamp-c_base stamp-backward: ${backward_headers} @@ -400,10 +425,12 @@ install-data-local: for file in ${ext_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir} - for file in ${c_base_headers}; do \ + for file in ${c_base_builddir}/${c_base_headers_rename}; do \ + $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done + for file in ${c_base_headers_extra}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${std_builddir} - for file in ${std_headers_rename}; do \ + for file in ${std_builddir}/${std_headers_rename}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers}; do \ @@ -414,3 +441,12 @@ install-data-local: # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} + +# Stop implicit '.o' make rules from ever stomping on extensionless +# headers, in the improbable case where some foolish, crack-addled +# developer tries to create them via make in the include build +# directory. (This is more of an example of how this kind of rule can +# be made.) +.PRECIOUS: $(std_headers_rename) $(c_base_headers_rename) +$(std_headers_rename): ; @: +$(c_base_headers_rename): ; @: diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 86ff6102194..0e0a935a35d 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -290,26 +290,49 @@ ext_headers = \ c_base_srcdir = @C_INCLUDE_DIR@ c_base_builddir = ./ c_base_headers = \ - ${c_base_srcdir}/cassert \ - ${c_base_srcdir}/cctype \ - ${c_base_srcdir}/cerrno \ - ${c_base_srcdir}/cfloat \ - ${c_base_srcdir}/ciso646 \ - ${c_base_srcdir}/climits \ - ${c_base_srcdir}/clocale \ - ${c_base_srcdir}/cmath \ - ${c_base_srcdir}/csetjmp \ - ${c_base_srcdir}/csignal \ - ${c_base_srcdir}/cstdarg \ - ${c_base_srcdir}/cstddef \ - ${c_base_srcdir}/cstdio \ - ${c_base_srcdir}/cstdlib \ - ${c_base_srcdir}/cstring \ - ${c_base_srcdir}/ctime \ - ${c_base_srcdir}/cwchar \ - ${c_base_srcdir}/cwctype \ + ${c_base_srcdir}/std_cassert.h \ + ${c_base_srcdir}/std_cctype.h \ + ${c_base_srcdir}/std_cerrno.h \ + ${c_base_srcdir}/std_cfloat.h \ + ${c_base_srcdir}/std_ciso646.h \ + ${c_base_srcdir}/std_climits.h \ + ${c_base_srcdir}/std_clocale.h \ + ${c_base_srcdir}/std_cmath.h \ + ${c_base_srcdir}/std_csetjmp.h \ + ${c_base_srcdir}/std_csignal.h \ + ${c_base_srcdir}/std_cstdarg.h \ + ${c_base_srcdir}/std_cstddef.h \ + ${c_base_srcdir}/std_cstdio.h \ + ${c_base_srcdir}/std_cstdlib.h \ + ${c_base_srcdir}/std_cstring.h \ + ${c_base_srcdir}/std_ctime.h \ + ${c_base_srcdir}/std_cwchar.h \ + ${c_base_srcdir}/std_cwctype.h + +# Some of the "C" headers need extra files. +c_base_headers_extra = \ ${c_base_srcdir}/cmath.tcc +c_base_headers_rename = \ + cassert \ + cctype \ + cerrno \ + cfloat \ + ciso646 \ + climits \ + clocale \ + cmath \ + csetjmp \ + csignal \ + cstdarg \ + cstddef \ + cstdio \ + cstdlib \ + cstring \ + ctime \ + cwchar \ + cwctype + std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = ./ @@ -346,35 +369,35 @@ std_headers = \ # Renamed at build time. std_headers_rename = \ - ${std_builddir}/algorithm \ - ${std_builddir}/bitset \ - ${std_builddir}/complex \ - ${std_builddir}/deque \ - ${std_builddir}/fstream \ - ${std_builddir}/functional \ - ${std_builddir}/iomanip \ - ${std_builddir}/ios \ - ${std_builddir}/iosfwd \ - ${std_builddir}/iostream \ - ${std_builddir}/istream \ - ${std_builddir}/iterator \ - ${std_builddir}/limits \ - ${std_builddir}/list \ - ${std_builddir}/locale \ - ${std_builddir}/map \ - ${std_builddir}/memory \ - ${std_builddir}/numeric \ - ${std_builddir}/ostream \ + algorithm \ + bitset \ + complex \ + deque \ + fstream \ + functional \ + iomanip \ + ios \ + iosfwd \ + iostream \ + istream \ + iterator \ + limits \ + list \ + locale \ + map \ + memory \ + numeric \ + ostream \ ${std_builddir}/queue \ - ${std_builddir}/set \ - ${std_builddir}/sstream \ - ${std_builddir}/stack \ - ${std_builddir}/stdexcept \ - ${std_builddir}/streambuf \ - ${std_builddir}/string \ - ${std_builddir}/utility \ - ${std_builddir}/valarray \ - ${std_builddir}/vector + set \ + sstream \ + stack \ + stdexcept \ + streambuf \ + string \ + utility \ + valarray \ + vector target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ @@ -547,11 +570,15 @@ stamp-bits: ${bits_headers} (cd ${bits_builddir} && @LN_S@ $? . || true) ;\ echo `date` > stamp-bits -stamp-c_base: ${c_base_headers} +stamp-c_base: ${c_base_headers} ${c_base_headers_extra} @if [ ! -d "${c_base_builddir}" ]; then \ mkdir -p ${c_base_builddir} ;\ fi ;\ - (cd ${c_base_builddir} && @LN_S@ $? . || true) ;\ + (cd ${c_base_builddir} && for h in ${c_base_headers}; do \ + official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ + @LN_S@ $$h ./$${official_name} || true ;\ + done) ;\ + (cd ${c_base_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\ echo `date` > stamp-c_base stamp-backward: ${backward_headers} @@ -634,10 +661,12 @@ install-data-local: for file in ${ext_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir} - for file in ${c_base_headers}; do \ + for file in ${c_base_builddir}/${c_base_headers_rename}; do \ + $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done + for file in ${c_base_headers_extra}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${std_builddir} - for file in ${std_headers_rename}; do \ + for file in ${std_builddir}/${std_headers_rename}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers}; do \ @@ -649,6 +678,14 @@ install-data-local: # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} +# Stop implicit '.o' make rules from ever stomping on extensionless +# headers, in the improbable case where some foolish, crack-addled +# developer tries to create them via make in the include build +# directory. +.PRECIOUS: $(std_headers_rename) $(c_base_headers_rename) +$(std_headers_rename): ; @: +$(c_base_headers_rename): ; @: + # 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. .NOEXPORT: diff --git a/libstdc++-v3/include/c/cassert b/libstdc++-v3/include/c/std_cassert.h similarity index 100% rename from libstdc++-v3/include/c/cassert rename to libstdc++-v3/include/c/std_cassert.h diff --git a/libstdc++-v3/include/c/cctype b/libstdc++-v3/include/c/std_cctype.h similarity index 100% rename from libstdc++-v3/include/c/cctype rename to libstdc++-v3/include/c/std_cctype.h diff --git a/libstdc++-v3/include/c/cerrno b/libstdc++-v3/include/c/std_cerrno.h similarity index 100% rename from libstdc++-v3/include/c/cerrno rename to libstdc++-v3/include/c/std_cerrno.h diff --git a/libstdc++-v3/include/c/cfloat b/libstdc++-v3/include/c/std_cfloat.h similarity index 100% rename from libstdc++-v3/include/c/cfloat rename to libstdc++-v3/include/c/std_cfloat.h diff --git a/libstdc++-v3/include/c/ciso646 b/libstdc++-v3/include/c/std_ciso646.h similarity index 100% rename from libstdc++-v3/include/c/ciso646 rename to libstdc++-v3/include/c/std_ciso646.h diff --git a/libstdc++-v3/include/c/climits b/libstdc++-v3/include/c/std_climits.h similarity index 100% rename from libstdc++-v3/include/c/climits rename to libstdc++-v3/include/c/std_climits.h diff --git a/libstdc++-v3/include/c/clocale b/libstdc++-v3/include/c/std_clocale.h similarity index 100% rename from libstdc++-v3/include/c/clocale rename to libstdc++-v3/include/c/std_clocale.h diff --git a/libstdc++-v3/include/c/cmath b/libstdc++-v3/include/c/std_cmath.h similarity index 100% rename from libstdc++-v3/include/c/cmath rename to libstdc++-v3/include/c/std_cmath.h diff --git a/libstdc++-v3/include/c/csetjmp b/libstdc++-v3/include/c/std_csetjmp.h similarity index 100% rename from libstdc++-v3/include/c/csetjmp rename to libstdc++-v3/include/c/std_csetjmp.h diff --git a/libstdc++-v3/include/c/csignal b/libstdc++-v3/include/c/std_csignal.h similarity index 100% rename from libstdc++-v3/include/c/csignal rename to libstdc++-v3/include/c/std_csignal.h diff --git a/libstdc++-v3/include/c/cstdarg b/libstdc++-v3/include/c/std_cstdarg.h similarity index 100% rename from libstdc++-v3/include/c/cstdarg rename to libstdc++-v3/include/c/std_cstdarg.h diff --git a/libstdc++-v3/include/c/cstddef b/libstdc++-v3/include/c/std_cstddef.h similarity index 100% rename from libstdc++-v3/include/c/cstddef rename to libstdc++-v3/include/c/std_cstddef.h diff --git a/libstdc++-v3/include/c/cstdio b/libstdc++-v3/include/c/std_cstdio.h similarity index 100% rename from libstdc++-v3/include/c/cstdio rename to libstdc++-v3/include/c/std_cstdio.h diff --git a/libstdc++-v3/include/c/cstdlib b/libstdc++-v3/include/c/std_cstdlib.h similarity index 100% rename from libstdc++-v3/include/c/cstdlib rename to libstdc++-v3/include/c/std_cstdlib.h diff --git a/libstdc++-v3/include/c/cstring b/libstdc++-v3/include/c/std_cstring.h similarity index 100% rename from libstdc++-v3/include/c/cstring rename to libstdc++-v3/include/c/std_cstring.h diff --git a/libstdc++-v3/include/c/ctime b/libstdc++-v3/include/c/std_ctime.h similarity index 100% rename from libstdc++-v3/include/c/ctime rename to libstdc++-v3/include/c/std_ctime.h diff --git a/libstdc++-v3/include/c/cwchar b/libstdc++-v3/include/c/std_cwchar.h similarity index 100% rename from libstdc++-v3/include/c/cwchar rename to libstdc++-v3/include/c/std_cwchar.h diff --git a/libstdc++-v3/include/c/cwctype b/libstdc++-v3/include/c/std_cwctype.h similarity index 100% rename from libstdc++-v3/include/c/cwctype rename to libstdc++-v3/include/c/std_cwctype.h diff --git a/libstdc++-v3/include/c_std/cassert b/libstdc++-v3/include/c_std/std_cassert.h similarity index 100% rename from libstdc++-v3/include/c_std/cassert rename to libstdc++-v3/include/c_std/std_cassert.h diff --git a/libstdc++-v3/include/c_std/cctype b/libstdc++-v3/include/c_std/std_cctype.h similarity index 100% rename from libstdc++-v3/include/c_std/cctype rename to libstdc++-v3/include/c_std/std_cctype.h diff --git a/libstdc++-v3/include/c_std/cerrno b/libstdc++-v3/include/c_std/std_cerrno.h similarity index 100% rename from libstdc++-v3/include/c_std/cerrno rename to libstdc++-v3/include/c_std/std_cerrno.h diff --git a/libstdc++-v3/include/c_std/cfloat b/libstdc++-v3/include/c_std/std_cfloat.h similarity index 100% rename from libstdc++-v3/include/c_std/cfloat rename to libstdc++-v3/include/c_std/std_cfloat.h diff --git a/libstdc++-v3/include/c_std/ciso646 b/libstdc++-v3/include/c_std/std_ciso646.h similarity index 100% rename from libstdc++-v3/include/c_std/ciso646 rename to libstdc++-v3/include/c_std/std_ciso646.h diff --git a/libstdc++-v3/include/c_std/climits b/libstdc++-v3/include/c_std/std_climits.h similarity index 100% rename from libstdc++-v3/include/c_std/climits rename to libstdc++-v3/include/c_std/std_climits.h diff --git a/libstdc++-v3/include/c_std/clocale b/libstdc++-v3/include/c_std/std_clocale.h similarity index 100% rename from libstdc++-v3/include/c_std/clocale rename to libstdc++-v3/include/c_std/std_clocale.h diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/std_cmath.h similarity index 100% rename from libstdc++-v3/include/c_std/cmath rename to libstdc++-v3/include/c_std/std_cmath.h diff --git a/libstdc++-v3/include/c_std/csetjmp b/libstdc++-v3/include/c_std/std_csetjmp.h similarity index 100% rename from libstdc++-v3/include/c_std/csetjmp rename to libstdc++-v3/include/c_std/std_csetjmp.h diff --git a/libstdc++-v3/include/c_std/csignal b/libstdc++-v3/include/c_std/std_csignal.h similarity index 100% rename from libstdc++-v3/include/c_std/csignal rename to libstdc++-v3/include/c_std/std_csignal.h diff --git a/libstdc++-v3/include/c_std/cstdarg b/libstdc++-v3/include/c_std/std_cstdarg.h similarity index 100% rename from libstdc++-v3/include/c_std/cstdarg rename to libstdc++-v3/include/c_std/std_cstdarg.h diff --git a/libstdc++-v3/include/c_std/cstddef b/libstdc++-v3/include/c_std/std_cstddef.h similarity index 100% rename from libstdc++-v3/include/c_std/cstddef rename to libstdc++-v3/include/c_std/std_cstddef.h diff --git a/libstdc++-v3/include/c_std/cstdio b/libstdc++-v3/include/c_std/std_cstdio.h similarity index 100% rename from libstdc++-v3/include/c_std/cstdio rename to libstdc++-v3/include/c_std/std_cstdio.h diff --git a/libstdc++-v3/include/c_std/cstdlib b/libstdc++-v3/include/c_std/std_cstdlib.h similarity index 100% rename from libstdc++-v3/include/c_std/cstdlib rename to libstdc++-v3/include/c_std/std_cstdlib.h diff --git a/libstdc++-v3/include/c_std/cstring b/libstdc++-v3/include/c_std/std_cstring.h similarity index 100% rename from libstdc++-v3/include/c_std/cstring rename to libstdc++-v3/include/c_std/std_cstring.h diff --git a/libstdc++-v3/include/c_std/ctime b/libstdc++-v3/include/c_std/std_ctime.h similarity index 100% rename from libstdc++-v3/include/c_std/ctime rename to libstdc++-v3/include/c_std/std_ctime.h diff --git a/libstdc++-v3/include/c_std/cwchar b/libstdc++-v3/include/c_std/std_cwchar.h similarity index 100% rename from libstdc++-v3/include/c_std/cwchar rename to libstdc++-v3/include/c_std/std_cwchar.h diff --git a/libstdc++-v3/include/c_std/cwctype b/libstdc++-v3/include/c_std/std_cwctype.h similarity index 100% rename from libstdc++-v3/include/c_std/cwctype rename to libstdc++-v3/include/c_std/std_cwctype.h