This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] config/make tweaks
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 8 Jan 2003 13:38:02 -0600
- Subject: [v3] config/make tweaks
Try once more to remove the multiplying 'multi-do' rules. Add in
cleaner debug rules, and correct some comments for --enable flags I
noticed with ./configure --help.
tested x86/linux
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.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.226
diff -c -p -r1.226 acinclude.m4
*** acinclude.m4 6 Jan 2003 21:22:11 -0000 1.226
--- acinclude.m4 8 Jan 2003 19:35:10 -0000
*************** AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
*** 1067,1073 ****
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],
changequote([, ])dnl
[case "${enableval}" in
yes) enable_debug=yes ;;
--- 1067,1073 ----
define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_ARG_ENABLE(debug,
changequote(<<, >>)dnl
! << --enable-debug build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
changequote([, ])dnl
[case "${enableval}" in
yes) enable_debug=yes ;;
Index: include/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/Makefile.am,v
retrieving revision 1.45
diff -c -p -r1.45 Makefile.am
*** include/Makefile.am 6 Jan 2003 21:22:56 -0000 1.45
--- include/Makefile.am 8 Jan 2003 19:35:10 -0000
***************
*** 1,6 ****
## Makefile for the include subdirectory of the GNU C++ Standard library.
##
! ## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
##
## This file is part of the libstdc++ version 3 distribution.
## Process this file with automake to produce Makefile.in.
--- 1,6 ----
## Makefile for the include subdirectory of the GNU C++ Standard library.
##
! ## 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.
*************** stamp-std: ${std_headers}
*** 349,366 ****
@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
stamp-bits: ${bits_headers}
@if [ ! -d "${bits_builddir}" ]; then \
mkdir -p ${bits_builddir} ;\
fi ;\
! (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
! echo `date` > stamp-bits
stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
@if [ ! -d "${c_base_builddir}" ]; then \
--- 349,370 ----
@if [ ! -d "${std_builddir}" ]; then \
mkdir -p ${std_builddir} ;\
fi ;\
! 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 ;\
! 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 \
*************** stamp-c_base: ${c_base_headers} ${c_base
*** 370,402 ****
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 \
(cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\
! 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} ;\
fi ;\
! (cd ${backward_builddir} && @LN_S@ $? . || true) ;\
! echo `date` > stamp-backward
stamp-ext: ${ext_headers}
@if [ ! -d "${ext_builddir}" ]; then \
! mkdir -p ${ext_builddir} ;\
fi ;\
! (cd ${ext_builddir} && @LN_S@ $? . || true) ;\
! echo `date` > stamp-ext
stamp-${target_alias}:
@if [ ! -d ${target_builddir} ]; then \
--- 374,414 ----
official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
@LN_S@ $$h ./$${official_name} || true ;\
done) ;\
! 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
stamp-c_compatibility: ${c_compatibility_headers_extra}
@if [ ! -d "${c_compatibility_builddir}" ]; then \
mkdir -p ${c_compatibility_builddir} ;\
fi ;\
! 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 ;\
! 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} ;\
fi ;\
! if [ ! -f stamp-ext ]; then \
! (cd ${ext_builddir} && @LN_S@ $? . || true) ;\
! echo `date` > stamp-ext ;\
! fi
stamp-${target_alias}:
@if [ ! -d ${target_builddir} ]; then \
*************** install-data-local:
*** 500,506 ****
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
# 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
--- 512,518 ----
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
# 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
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.116
diff -c -p -r1.116 Makefile.am
*** src/Makefile.am 31 Dec 2002 00:58:36 -0000 1.116
--- src/Makefile.am 8 Jan 2003 19:35:10 -0000
***************
*** 1,6 ****
## Makefile for the src subdirectory of the GNU C++ Standard library.
##
! ## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
## Free Software Foundation, Inc.
##
## This file is part of the libstdc++ version 3 distribution.
--- 1,6 ----
## Makefile for the src subdirectory of the GNU C++ Standard library.
##
! ## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
## Free Software Foundation, Inc.
##
## This file is part of the libstdc++ version 3 distribution.
*************** stamp-debug:
*** 239,251 ****
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) ; \
fi; \
echo `date` > stamp-debug;
--- 239,250 ----
if test ! -d ${debugdir}; then \
mkdir -p ${debugdir}; \
(cd ${debugdir}; \
! 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;