Makefile.am (extract_symvers): Revert accidental change.

* testsuite/Makefile.am (extract_symvers): Revert accidental
	change.
	* testsuite/Makefile.in: Regenerate.

	* configure.in: Pass MULTISUBDIR to testsuite/Makefile.
	* configure: Regenerated.

From-SVN: r68220
This commit is contained in:
Andreas Jaeger 2003-06-19 21:54:04 +02:00
parent d3ea6201da
commit 97460e9a72
5 changed files with 33 additions and 9 deletions

View File

@ -1,3 +1,12 @@
2003-06-19 Andreas Jaeger <aj@suse.de>
* testsuite/Makefile.am (extract_symvers): Revert accidental
change.
* testsuite/Makefile.in: Regenerate.
* configure.in: Pass MULTISUBDIR to testsuite/Makefile.
* configure: Regenerated.
2003-06-19 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_sstream.h (_M_sync): Make non virtual.
@ -9,7 +18,7 @@
(report_performance): New.
(start_counters): New.
(stop_counters): New.
(clear_counters): New.
(clear_counters): New.
* testsuite/performance/allocator.cc: Instrument.
* testsuite/performance/cout_insert_int.cc: Same.
* testsuite/performance/complex_norm.cc: Same.
@ -19,11 +28,11 @@
* testsuite/performance/map_create_fill.cc: Same.
* testsuite/performance/ofstream_insert_float.cc: Same.
* testsuite/performance/ofstream_insert_int.cc: Same.
* testsuite/performance/string_append.cc: Convert.
* testsuite/performance/string_append.cc: Convert.
* scripts/check_performance: New.
* testsuite/Makefile.am (check-performance): New.
(CLEANFILES): Add.
2003-06-18 Paolo Carlini <pcarlini@unitus.it>
Benjamin Kosnik <bkoz@redhat.com>

View File

@ -24367,6 +24367,11 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
;;
esac
case $CONFIG_FILES in
*testsuite/Makefile*)
grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
;;
esac
fi
fi
chmod +x scripts/check_survey

View File

@ -477,10 +477,10 @@ fi
AC_SUBST(LIBSUPCXX_PICFLAGS)
# Generate the various Makefiles, include files, and scripts.
# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
# and libsupc++/Makefile.am so that multilib installs will end up
# installed in the correct place. To work around this not being passed
# down from config-ml.in -> top_srcdir/Makefile.am ->
# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am,
# libsupc++/Makefile.am and testsuite/Makefile.am so that multilib installs
# will end up installed in the correct place. To work around this not being
# passed # down from config-ml.in -> top_srcdir/Makefile.am ->
# top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
AC_OUTPUT(Makefile \
include/Makefile src/Makefile \
@ -506,6 +506,11 @@ po/Makefile testsuite/Makefile scripts/check_survey scripts/testsuite_flags,
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
;;
esac
case $CONFIG_FILES in
*testsuite/Makefile*)
grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
;;
esac
fi
fi
chmod +x scripts/check_survey
@ -547,6 +552,11 @@ dnl *libsupc++/Makefile*)
dnl grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
dnl ;;
dnl esac
dnl case $CONFIG_FILES in
dnl *testsuite/Makefile*)
dnl grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
dnl ;;
dnl esac
dnl fi
dnl chmod +x scripts/check_survey
dnl chmod +x scripts/testsuite_flags

View File

@ -87,7 +87,7 @@ check-local: check-abi
baseline_dir = @baseline_dir@
baseline_file = ${baseline_dir}/baseline_symbols.txt
extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
-@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)

View File

@ -181,7 +181,7 @@ abi_check_SOURCES = abi_check.cc
baseline_dir = @baseline_dir@
baseline_file = ${baseline_dir}/baseline_symbols.txt
extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
# These two special 'check-script' rules use the bash script
# 'check_survey' to do testing. This script is not as portable as the