diff options
Diffstat (limited to 'contrib/libstdc++/include/Makefile.am')
| -rw-r--r-- | contrib/libstdc++/include/Makefile.am | 70 |
1 files changed, 56 insertions, 14 deletions
diff --git a/contrib/libstdc++/include/Makefile.am b/contrib/libstdc++/include/Makefile.am index 38d1f7b..cb29b24 100644 --- a/contrib/libstdc++/include/Makefile.am +++ b/contrib/libstdc++/include/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.3 cygnus MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs @@ -96,7 +96,7 @@ bits_headers = \ ${bits_srcdir}/type_traits.h \ ${bits_srcdir}/valarray_array.h \ ${bits_srcdir}/valarray_array.tcc \ - ${bits_srcdir}/valarray_meta.h + ${bits_srcdir}/valarray_meta.h backward_srcdir = ${glibcpp_srcdir}/include/backward backward_builddir = ./backward @@ -201,15 +201,45 @@ c_base_headers_rename = \ cwchar \ cwctype +# "C" compatibility headers. +c_compatibility_srcdir = ${glibcpp_srcdir}/include/c_compatibility +c_compatibility_builddir = . +c_compatibility_headers = \ + ${c_compatibility_srcdir}/assert.h \ + ${c_compatibility_srcdir}/ctype.h \ + ${c_compatibility_srcdir}/errno.h \ + ${c_compatibility_srcdir}/float.h \ + ${c_compatibility_srcdir}/iso646.h \ + ${c_compatibility_srcdir}/limits.h \ + ${c_compatibility_srcdir}/locale.h \ + ${c_compatibility_srcdir}/math.h \ + ${c_compatibility_srcdir}/setjmp.h \ + ${c_compatibility_srcdir}/signal.h \ + ${c_compatibility_srcdir}/stdarg.h \ + ${c_compatibility_srcdir}/stddef.h \ + ${c_compatibility_srcdir}/stdio.h \ + ${c_compatibility_srcdir}/stdlib.h \ + ${c_compatibility_srcdir}/string.h \ + ${c_compatibility_srcdir}/time.h \ + ${c_compatibility_srcdir}/wchar.h \ + ${c_compatibility_srcdir}/wctype.h + # Some of the different "C" header models need extra files. +# Some "C" header schemes require the "C" compatibility headers. # For --enable-cheaders=c_std if GLIBCPP_C_HEADERS_C_STD -c_base_headers_extra = \ - ${c_base_srcdir}/cmath.tcc +c_base_headers_extra = ${c_base_srcdir}/cmath.tcc else c_base_headers_extra = endif +if GLIBCPP_C_HEADERS_COMPATIBILITY +c_compatibility_headers_extra = ${c_compatibility_headers} +else +c_compatibility_headers_extra = +endif + + std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = . std_headers = \ @@ -283,8 +313,8 @@ target_headers = \ ${target_srcdir}/os_defines.h \ ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h -# These extra_target_headers files are all built with ad hoc naming rules. -extra_target_headers = \ +# These target_headers_extra files are all built with ad hoc naming rules. +target_headers_extra = \ ${target_builddir}/basic_file.h \ ${target_builddir}/c++config.h \ ${target_builddir}/c++io.h \ @@ -300,7 +330,9 @@ thread_target_headers = \ # List of all timestamp files. By keeping only one copy of this list, both # CLEANFILES and all-local are kept up-to-date. -allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \ +allstamps = \ + stamp-std stamp-bits stamp-c_base stamp-c_compatibility \ + stamp-backward stamp-ext \ ${target_builddir}/stamp-target @@ -339,6 +371,15 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra} fi ;\ echo `date` > stamp-c_base +stamp-c_compatibility: ${c_compatibility_headers_extra} + @if [ ! -d "${c_compatibility_builddir}" ]; then \ + mkdir -p ${c_compatibility_builddir} ;\ + fi ;\ + if [ ! -z "${c_compatibility_headers_extra}" ]; then \ + (cd ${c_compatibility_builddir} && @LN_S@ $? . || true) ;\ + fi ;\ + echo `date` > stamp-c_compatibility + stamp-backward: ${backward_headers} @if [ ! -d "${backward_builddir}" ]; then \ mkdir -p ${backward_builddir} ;\ @@ -420,7 +461,7 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ # components. Yes, with minor differences, this is sheer duplication # of the staging rules above using $(INSTALL_DATA) instead of LN_S and # `$(mkinstalldirs)' instead of `mkdir -p'. In particular, -# extra_target_headers are taken out of the build tree staging area; +# target_headers_extra are taken out of the build tree staging area; # the rest are taken from the original source tree. gxx_include_dir = @gxx_include_dir@ install-data-local: @@ -436,17 +477,18 @@ install-data-local: $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} \ - ${gxx_include_dir}/${c_base_builddir}; done - c_base_headers_extra_install=${c_base_headers_extra};\ + $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done + c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done + c_compatibility_headers_install='$(c_compatibility_headers_extra)';\ + for file in $$c_compatibility_headers_install; do \ + $(INSTALL_DATA) $$file ${gxx_include_dir}; done $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} \ - ${gxx_include_dir}/${std_builddir}; done + $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} - for file in ${target_headers} ${extra_target_headers} \ + for file in ${target_headers} ${target_headers_extra} \ ${thread_target_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done |
