[multiple changes]
2003-01-08 Benjamin Kosnik <bkoz@redhat.com>
* include/Makefile.am (stamp-*): Add checks for existing stamps.
* include/Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Correct comment.
* aclocal.m4: Regenerate.
* configure.in: Don't add new multi-do rules every time the
directory is reconfigured.
* configure: Regenerate.
2003-01-08 Brad Spencer <spencer@infointeractive.com>
Nathan Myers <ncm@cantrip.org>
* src/Makefile.am (stamp-debug): Clean.
* src/Makefile.in: Regenerate.
From-SVN: r61052
This commit is contained in:
Benjamin Kosnik
parent
11f6b45110
commit
7ec3af37b9
|
|
@ -1,3 +1,21 @@
|
|||
2003-01-08 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/Makefile.am (stamp-*): Add checks for existing stamps.
|
||||
* include/Makefile.in: Regenerate.
|
||||
|
||||
* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Correct comment.
|
||||
* aclocal.m4: Regenerate.
|
||||
|
||||
* configure.in: Don't add new multi-do rules every time the
|
||||
directory is reconfigured.
|
||||
* configure: Regenerate.
|
||||
|
||||
2003-01-08 Brad Spencer <spencer@infointeractive.com>
|
||||
Nathan Myers <ncm@cantrip.org>
|
||||
|
||||
* src/Makefile.am (stamp-debug): Clean.
|
||||
* src/Makefile.in: Regenerate.
|
||||
|
||||
2003-01-07 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
PR libstdc++/8707
|
||||
|
|
|
|||
|
|
@ -1067,7 +1067,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
|
|||
define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
||||
AC_ARG_ENABLE(debug,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-debug extra debugging, turn off optimization [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
|
||||
<< --enable-debug build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "${enableval}" in
|
||||
yes) enable_debug=yes ;;
|
||||
|
|
|
|||
|
|
@ -1079,7 +1079,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
|
|||
define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
||||
AC_ARG_ENABLE(debug,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-debug extra debugging, turn off optimization [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
|
||||
<< --enable-debug build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "${enableval}" in
|
||||
yes) enable_debug=yes ;;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ ac_help="$ac_help
|
|||
--enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
|
||||
[default=]"
|
||||
ac_help="$ac_help
|
||||
--enable-debug extra debugging, turn off optimization [default=no]"
|
||||
--enable-debug build extra debug library [default=no]"
|
||||
ac_help="$ac_help
|
||||
--enable-debug-flags=FLAGS pass compiler FLAGS when building debug
|
||||
library;[default=none]"
|
||||
|
|
@ -24313,15 +24313,17 @@ CXX="${CXX}"
|
|||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
fi
|
||||
if ! test -f stamp-h; then
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
chmod +x mkcheck
|
||||
chmod +x testsuite_flags
|
||||
|
||||
|
|
|
|||
|
|
@ -474,15 +474,17 @@ AC_OUTPUT(Makefile \
|
|||
include/Makefile src/Makefile \
|
||||
libmath/Makefile libio/Makefile libsupc++/Makefile \
|
||||
po/Makefile testsuite/Makefile mkcheck testsuite_flags,
|
||||
[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
fi
|
||||
[ if ! test -f stamp-h; then
|
||||
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
chmod +x mkcheck
|
||||
chmod +x testsuite_flags
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
## Makefile for the include subdirectory of the GNU C++ Standard library.
|
||||
##
|
||||
## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
##
|
||||
## This file is part of the libstdc++ version 3 distribution.
|
||||
## Process this file with automake to produce Makefile.in.
|
||||
|
|
@ -349,18 +349,22 @@ stamp-std: ${std_headers}
|
|||
@if [ ! -d "${std_builddir}" ]; then \
|
||||
mkdir -p ${std_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${std_builddir} && for h in $?; do \
|
||||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
echo `date` > stamp-std
|
||||
if [ ! -f stamp-std ]; then \
|
||||
(cd ${std_builddir} && for h in $?; do \
|
||||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
echo `date` > stamp-std ;\
|
||||
fi
|
||||
|
||||
stamp-bits: ${bits_headers}
|
||||
@if [ ! -d "${bits_builddir}" ]; then \
|
||||
mkdir -p ${bits_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-bits
|
||||
if [ ! -f stamp-bits ]; then \
|
||||
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-bits ;\
|
||||
fi
|
||||
|
||||
stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
|
||||
@if [ ! -d "${c_base_builddir}" ]; then \
|
||||
|
|
@ -370,33 +374,41 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
|
|||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
if [ ! -z "${c_base_headers_extra}" ]; then \
|
||||
if [ ! -f stamp-c_base ]; then \
|
||||
if [ ! -z "${c_base_headers_extra}" ]; then \
|
||||
(cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\
|
||||
fi ;\
|
||||
echo `date` > stamp-c_base
|
||||
fi ;\
|
||||
echo `date` > stamp-c_base ;\
|
||||
fi
|
||||
|
||||
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
|
||||
if [ ! -f stamp-c_compatibility ]; then \
|
||||
if [ ! -z "${c_compatibility_headers_extra}" ]; then \
|
||||
(cd ${c_compatibility_builddir} && @LN_S@ $? . || true) ;\
|
||||
fi ;\
|
||||
echo `date` > stamp-c_compatibility ;\
|
||||
fi
|
||||
|
||||
stamp-backward: ${backward_headers}
|
||||
@if [ ! -d "${backward_builddir}" ]; then \
|
||||
mkdir -p ${backward_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${backward_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-backward
|
||||
if [ ! -f stamp-backward ]; then \
|
||||
(cd ${backward_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-backward ;\
|
||||
fi
|
||||
|
||||
stamp-ext: ${ext_headers}
|
||||
@if [ ! -d "${ext_builddir}" ]; then \
|
||||
mkdir -p ${ext_builddir} ;\
|
||||
mkdir -p ${ext_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${ext_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-ext
|
||||
if [ ! -f stamp-ext ]; then \
|
||||
(cd ${ext_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-ext ;\
|
||||
fi
|
||||
|
||||
stamp-${target_alias}:
|
||||
@if [ ! -d ${target_builddir} ]; then \
|
||||
|
|
@ -500,7 +512,7 @@ install-data-local:
|
|||
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
|
||||
|
||||
# By adding these files here, automake will remove them for 'make clean'
|
||||
#CLEANFILES = ${allstamps}
|
||||
#CLEANFILES = ${allstamps}
|
||||
|
||||
# Stop implicit '.o' make rules from ever stomping on extensionless
|
||||
# headers, in the improbable case where some foolish, crack-addled
|
||||
|
|
|
|||
|
|
@ -582,18 +582,22 @@ stamp-std: ${std_headers}
|
|||
@if [ ! -d "${std_builddir}" ]; then \
|
||||
mkdir -p ${std_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${std_builddir} && for h in $?; do \
|
||||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
echo `date` > stamp-std
|
||||
if [ ! -f stamp-std ]; then \
|
||||
(cd ${std_builddir} && for h in $?; do \
|
||||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
echo `date` > stamp-std ;\
|
||||
fi
|
||||
|
||||
stamp-bits: ${bits_headers}
|
||||
@if [ ! -d "${bits_builddir}" ]; then \
|
||||
mkdir -p ${bits_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-bits
|
||||
if [ ! -f stamp-bits ]; then \
|
||||
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-bits ;\
|
||||
fi
|
||||
|
||||
stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
|
||||
@if [ ! -d "${c_base_builddir}" ]; then \
|
||||
|
|
@ -603,33 +607,41 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
|
|||
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
|
||||
@LN_S@ $$h ./$${official_name} || true ;\
|
||||
done) ;\
|
||||
if [ ! -z "${c_base_headers_extra}" ]; then \
|
||||
if [ ! -f stamp-c_base ]; then \
|
||||
if [ ! -z "${c_base_headers_extra}" ]; then \
|
||||
(cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\
|
||||
fi ;\
|
||||
echo `date` > stamp-c_base
|
||||
fi ;\
|
||||
echo `date` > stamp-c_base ;\
|
||||
fi
|
||||
|
||||
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
|
||||
if [ ! -f stamp-c_compatibility ]; then \
|
||||
if [ ! -z "${c_compatibility_headers_extra}" ]; then \
|
||||
(cd ${c_compatibility_builddir} && @LN_S@ $? . || true) ;\
|
||||
fi ;\
|
||||
echo `date` > stamp-c_compatibility ;\
|
||||
fi
|
||||
|
||||
stamp-backward: ${backward_headers}
|
||||
@if [ ! -d "${backward_builddir}" ]; then \
|
||||
mkdir -p ${backward_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${backward_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-backward
|
||||
if [ ! -f stamp-backward ]; then \
|
||||
(cd ${backward_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-backward ;\
|
||||
fi
|
||||
|
||||
stamp-ext: ${ext_headers}
|
||||
@if [ ! -d "${ext_builddir}" ]; then \
|
||||
mkdir -p ${ext_builddir} ;\
|
||||
mkdir -p ${ext_builddir} ;\
|
||||
fi ;\
|
||||
(cd ${ext_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-ext
|
||||
if [ ! -f stamp-ext ]; then \
|
||||
(cd ${ext_builddir} && @LN_S@ $? . || true) ;\
|
||||
echo `date` > stamp-ext ;\
|
||||
fi
|
||||
|
||||
stamp-${target_alias}:
|
||||
@if [ ! -d ${target_builddir} ]; then \
|
||||
|
|
@ -719,7 +731,7 @@ install-data-local:
|
|||
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
|
||||
|
||||
# By adding these files here, automake will remove them for 'make clean'
|
||||
#CLEANFILES = ${allstamps}
|
||||
#CLEANFILES = ${allstamps}
|
||||
|
||||
# Stop implicit '.o' make rules from ever stomping on extensionless
|
||||
# headers, in the improbable case where some foolish, crack-addled
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
## Makefile for the src subdirectory of the GNU C++ Standard library.
|
||||
##
|
||||
## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
|
||||
## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
## Free Software Foundation, Inc.
|
||||
##
|
||||
## This file is part of the libstdc++ version 3 distribution.
|
||||
|
|
@ -239,13 +239,12 @@ stamp-debug:
|
|||
if test ! -d ${debugdir}; then \
|
||||
mkdir -p ${debugdir}; \
|
||||
(cd ${debugdir}; \
|
||||
cp ../Makefile .; \
|
||||
sed 's/top_builddir = ../top_builddir = ..\/../g' \
|
||||
< Makefile > temp.1; \
|
||||
sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
|
||||
sed 's/install-data-local: install_debug/install-data-local:/g' \
|
||||
< temp.2 > temp.3; \
|
||||
mv temp.3 Makefile) ; \
|
||||
sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
|
||||
-e 's/srcdir = \.\./srcdir = ..\/../' \
|
||||
-e 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../' \
|
||||
-e 's/all-local: build_debug/all-local:/' \
|
||||
-e 's/install-data-local: install_debug/install-data-local:/' \
|
||||
< ../Makefile > Makefile) ; \
|
||||
fi; \
|
||||
echo `date` > stamp-debug;
|
||||
|
||||
|
|
|
|||
|
|
@ -594,13 +594,12 @@ stamp-debug:
|
|||
if test ! -d ${debugdir}; then \
|
||||
mkdir -p ${debugdir}; \
|
||||
(cd ${debugdir}; \
|
||||
cp ../Makefile .; \
|
||||
sed 's/top_builddir = ../top_builddir = ..\/../g' \
|
||||
< Makefile > temp.1; \
|
||||
sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
|
||||
sed 's/install-data-local: install_debug/install-data-local:/g' \
|
||||
< temp.2 > temp.3; \
|
||||
mv temp.3 Makefile) ; \
|
||||
sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
|
||||
-e 's/srcdir = \.\./srcdir = ..\/../' \
|
||||
-e 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../' \
|
||||
-e 's/all-local: build_debug/all-local:/' \
|
||||
-e 's/install-data-local: install_debug/install-data-local:/' \
|
||||
< ../Makefile > Makefile) ; \
|
||||
fi; \
|
||||
echo `date` > stamp-debug;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue