git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.am: Add comment. 

2003-08-26  Phil Edwards  <pme@gcc.gnu.org>

	* Makefile.am:  Add comment.
	* acinclude.m4 (GLIBCXX_CONFIGURE):  Set new glibcxx_SUBDIRS and
	SUBDIRS variables.
	* configure.ac:  Use them both here, instead of hardcoded lists.

	* fragment.am:  Add STAMP varaible.
	* include/Makefile.am:  Cosmetic whitespace cleanup.  Use $(LN_S)
	instead of @LN_S@.
	(stamp-*):  Move file creation rule outside of 'if' branches to
	ensure the stamp-* files are actually updated.  Use $(STAMP).
	* src/Makefile.am:  Remove now-nonexistant variable.
	* libsupc++/Makefile.am:  Likewise.  Snap the assignment chain
	for -prefer-pic.
	* po/Makefile.am:  Include same fragment as all the others.

	* aclocal.m4, configure, Makefile.in, include/Makefile.in,
	libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in:  Regenerated.

From-SVN: r70836
This commit is contained in:
Phil Edwards 2003-08-27 00:38:28 +00:00
parent 48ab3fe3c9
commit 82ba99d59e
17 changed files with 194 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,23 @@
2003-08-26 Phil Edwards <pme@gcc.gnu.org>
* Makefile.am: Add comment.
* acinclude.m4 (GLIBCXX_CONFIGURE): Set new glibcxx_SUBDIRS and
SUBDIRS variables.
* configure.ac: Use them both here, instead of hardcoded lists.
* fragment.am: Add STAMP varaible.
* include/Makefile.am: Cosmetic whitespace cleanup. Use $(LN_S)
instead of @LN_S@.
(stamp-*): Move file creation rule outside of 'if' branches to
ensure the stamp-* files are actually updated. Use $(STAMP).
* src/Makefile.am: Remove now-nonexistant variable.
* libsupc++/Makefile.am: Likewise. Snap the assignment chain
for -prefer-pic.
* po/Makefile.am: Include same fragment as all the others.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in: Regenerated.
2003-08-26 Loren J. Rittle <ljrittle@acm.org>
* testsuite/data/cin_unget-1.txt: New.

1
libstdc++-v3/Makefile.am
View File

@ -24,6 +24,7 @@
include $(top_srcdir)/fragment.am
## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE.
SUBDIRS = include libmath libsupc++ src po testsuite
# These rules are messy, but are hella worth it.

3
libstdc++-v3/Makefile.in
View File

@ -200,6 +200,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
@ -631,7 +632,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive

7
libstdc++-v3/acinclude.m4
View File

@ -48,6 +48,7 @@ dnl variables like $host.
dnl
dnl Sets:
dnl gcc_version (x.y.z format)
dnl SUBDIRS
dnl Substs:
dnl glibcxx_builddir (absolute path)
dnl glibcxx_srcdir (absolute path)
@ -61,6 +62,12 @@ dnl - default settings for all AM_CONFITIONAL test variables
dnl - lots of tools, like CC and CXX
dnl
AC_DEFUN(GLIBCXX_CONFIGURE, [
# Keep these sync'd with the list in Makefile.am. The first provides an
# expandable list at autoconf time; the second provides an expandable list
# (i.e., shell variable) at configure time.
m4_define([glibcxx_SUBDIRS],[include libmath libsupc++ src po testsuite])
SUBDIRS='glibcxx_SUBDIRS'
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.

7
libstdc++-v3/aclocal.m4 vendored
View File

@ -61,6 +61,7 @@ dnl variables like $host.
dnl
dnl Sets:
dnl gcc_version (x.y.z format)
dnl SUBDIRS
dnl Substs:
dnl glibcxx_builddir (absolute path)
dnl glibcxx_srcdir (absolute path)
@ -74,6 +75,12 @@ dnl - default settings for all AM_CONFITIONAL test variables
dnl - lots of tools, like CC and CXX
dnl
AC_DEFUN(GLIBCXX_CONFIGURE, [
# Keep these sync'd with the list in Makefile.am. The first provides an
# expandable list at autoconf time; the second provides an expandable list
# (i.e., shell variable) at configure time.
m4_define([glibcxx_SUBDIRS],[include libmath libsupc++ src po testsuite])
SUBDIRS='glibcxx_SUBDIRS'
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.

54
libstdc++-v3/configure vendored
View File

@ -969,7 +969,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
cd $ac_popdir
cd "$ac_popdir"
done
fi
@ -1168,7 +1168,7 @@ _ASBOX
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
rm -f core core.* *.core &&
rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@ -1932,6 +1932,12 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# up critical shell variables.
# Keep these sync'd with the list in Makefile.am. The first provides an
# expandable list at autoconf time; the second provides an expandable list
# (i.e., shell variable) at configure time.
SUBDIRS='include libmath libsupc++ src po testsuite'
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
@ -2758,8 +2764,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
'#include <stdlib.h>' \
'' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@ -2773,8 +2778,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
$ac_declaration
#include <stdlib.h>
int
main ()
{
@ -3084,8 +3089,7 @@ else
fi
fi
for ac_declaration in \
''\
'#include <stdlib.h>' \
'' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@ -3099,8 +3103,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
$ac_declaration
#include <stdlib.h>
int
main ()
{
@ -4283,7 +4287,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4286 "configure"' > conftest.$ac_ext
echo '#line 4290 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -4852,7 +4856,7 @@ fi;
#
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF
#line 4855 "configure"
#line 4859 "configure"
struct S { ~S(); };
void bar();
void foo()
@ -5452,7 +5456,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@ -5643,7 +5647,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
enable_clocale_flag=generic
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
@ -7825,7 +7829,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -26687,7 +26691,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@ -45631,7 +45635,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -47636,7 +47640,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -49510,7 +49514,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -51393,7 +51397,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -53223,7 +53227,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -54952,7 +54956,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_sectionLDflags=no
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
@ -57799,7 +57803,7 @@ else
fi
ac_config_files="$ac_config_files Makefile include/Makefile libmath/Makefile libsupc++/Makefile po/Makefile src/Makefile testsuite/Makefile"
ac_config_files="$ac_config_files Makefile include/Makefile libmath/Makefile libsupc++/Makefile src/Makefile po/Makefile testsuite/Makefile"
ac_config_files="$ac_config_files scripts/check_survey"
@ -58407,7 +58411,9 @@ multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
# No init-vars needed so far which aren't already passed by autoconf.
# Variables needed in config.status (file generation) which aren't already
# passed by autoconf.
SUBDIRS="$SUBDIRS"
_ACEOF
@ -58423,8 +58429,8 @@ do
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"libmath/Makefile" ) CONFIG_FILES="$CONFIG_FILES libmath/Makefile" ;;
"libsupc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;;
"po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
"testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"scripts/check_survey" ) CONFIG_FILES="$CONFIG_FILES scripts/check_survey" ;;
"scripts/testsuite_flags" ) CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;;
@ -59173,7 +59179,7 @@ esac ;;
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
for i in libmath libsupc++ src testsuite; do
for i in $SUBDIRS; do
case $CONFIG_FILES in
*${i}/Makefile*)
#echo "Adding MULTISUBDIR to $i/Makefile"

17
libstdc++-v3/configure.ac
View File

@ -294,15 +294,10 @@ AC_SUBST(LIBSUPCXX_PICFLAGS)
dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros,
dnl which can all be called multiple times as needed, plus one (different)
dnl AC_OUPUT macro. This one lists the files to be created:
AC_CONFIG_FILES([ \
AC_CONFIG_FILES( \
Makefile \
include/Makefile \
libmath/Makefile \
libsupc++/Makefile \
po/Makefile \
src/Makefile \
testsuite/Makefile \
])
AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ])
)
AC_CONFIG_FILES([scripts/check_survey],[chmod +x scripts/check_survey])
AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags])
@ -320,7 +315,7 @@ AC_CONFIG_COMMANDS([default],
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
for i in libmath libsupc++ src testsuite; do
for i in $SUBDIRS; do
case $CONFIG_FILES in
*${i}/Makefile*)
#echo "Adding MULTISUBDIR to $i/Makefile"
@ -335,7 +330,9 @@ _EOF
(cd include && ${MAKE-make})
],
[
# No init-vars needed so far which aren't already passed by autoconf.
# Variables needed in config.status (file generation) which aren't already
# passed by autoconf.
SUBDIRS="$SUBDIRS"
])
dnl And this actually makes things happen:

1
libstdc++-v3/fragment.am
View File

@ -5,6 +5,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)

64
libstdc++-v3/include/Makefile.am
View File

@ -371,19 +371,19 @@ stamp-std: ${std_headers}
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 ;\
$(LN_S) $$h ./$${official_name} || true ;\
done) ;\
echo `date` > stamp-std ;\
fi
fi ;\
$(STAMP) stamp-std
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
(cd ${bits_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-bits
stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra}
@if [ ! -d "${c_base_builddir}" ]; then \
@ -392,13 +392,13 @@ stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra}
if [ ! -f stamp-c_base ]; then \
(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 ;\
$(LN_S) $$h ./$${official_name} || true ;\
done) ;\
if [ ! -z "${c_base_headers_extra}" ]; then \
(cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\
(cd ${bits_builddir} && $(LN_S) ${c_base_headers_extra} . || true) ;\
fi ;\
echo `date` > stamp-c_base ;\
fi
fi ;\
$(STAMP) stamp-c_base
stamp-c_compatibility: ${c_compatibility_headers_extra}
@if [ ! -d "${c_compatibility_builddir}" ]; then \
@ -406,53 +406,53 @@ stamp-c_compatibility: ${c_compatibility_headers_extra}
fi ;\
if [ ! -f stamp-c_compatibility ]; then \
if [ ! -z "${c_compatibility_headers_extra}" ]; then \
(cd ${c_compatibility_builddir} && @LN_S@ $? . || true) ;\
(cd ${c_compatibility_builddir} && $(LN_S) $? . || true) ;\
fi ;\
echo `date` > stamp-c_compatibility ;\
fi
fi ;\
$(STAMP) stamp-c_compatibility
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
(cd ${backward_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-backward
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
(cd ${ext_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-ext
stamp-${host_alias}:
@if [ ! -d ${host_builddir} ]; then \
mkdir -p ${host_builddir} ;\
echo `date` > stamp-${host_alias} ;\
fi
fi ;\
$(STAMP) stamp-${host_alias}
# Host includes static.
# XXX Missing dependency info for {host_headers_extra}
stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
@LN_S@ ${host_headers} . || true ;\
@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
echo `date` > stamp-host ; \
fi
$(LN_S) ${host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
$(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host
# Host includes dynamic.
${host_builddir}/c++config.h: ${CONFIG_HEADER} \
${host_builddir}/c++config.h: ${top_builddir}/config.h \
${glibcxx_srcdir}/include/bits/c++config \
stamp-${host_alias}
@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\

65
libstdc++-v3/include/Makefile.in
View File

@ -211,6 +211,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
@ -732,19 +733,19 @@ stamp-std: ${std_headers}
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 ;\
$(LN_S) $$h ./$${official_name} || true ;\
done) ;\
echo `date` > stamp-std ;\
fi
fi ;\
$(STAMP) stamp-std
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
(cd ${bits_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-bits
stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra}
@if [ ! -d "${c_base_builddir}" ]; then \
@ -753,13 +754,13 @@ stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra}
if [ ! -f stamp-c_base ]; then \
(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 ;\
$(LN_S) $$h ./$${official_name} || true ;\
done) ;\
if [ ! -z "${c_base_headers_extra}" ]; then \
(cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra} . || true) ;\
(cd ${bits_builddir} && $(LN_S) ${c_base_headers_extra} . || true) ;\
fi ;\
echo `date` > stamp-c_base ;\
fi
fi ;\
$(STAMP) stamp-c_base
stamp-c_compatibility: ${c_compatibility_headers_extra}
@if [ ! -d "${c_compatibility_builddir}" ]; then \
@ -767,53 +768,53 @@ stamp-c_compatibility: ${c_compatibility_headers_extra}
fi ;\
if [ ! -f stamp-c_compatibility ]; then \
if [ ! -z "${c_compatibility_headers_extra}" ]; then \
(cd ${c_compatibility_builddir} && @LN_S@ $? . || true) ;\
(cd ${c_compatibility_builddir} && $(LN_S) $? . || true) ;\
fi ;\
echo `date` > stamp-c_compatibility ;\
fi
fi ;\
$(STAMP) stamp-c_compatibility
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
(cd ${backward_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-backward
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
(cd ${ext_builddir} && $(LN_S) $? . || true) ;\
fi ;\
$(STAMP) stamp-ext
stamp-${host_alias}:
@if [ ! -d ${host_builddir} ]; then \
mkdir -p ${host_builddir} ;\
echo `date` > stamp-${host_alias} ;\
fi
fi ;\
$(STAMP) stamp-${host_alias}
# Host includes static.
# XXX Missing dependency info for {host_headers_extra}
stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
@LN_S@ ${host_headers} . || true ;\
@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
@LN_S@ ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
echo `date` > stamp-host ; \
fi
$(LN_S) ${host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
$(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host
# Host includes dynamic.
${host_builddir}/c++config.h: ${CONFIG_HEADER} \
${host_builddir}/c++config.h: ${top_builddir}/config.h \
${glibcxx_srcdir}/include/bits/c++config \
stamp-${host_alias}
@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\

5
libstdc++-v3/libsupc++/Makefile.am
View File

@ -31,9 +31,6 @@ toolexeclib_LTLIBRARIES = libsupc++.la
noinst_LTLIBRARIES = libsupc++convenience.la
LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@
headers = \
exception new typeinfo cxxabi.h exception_defines.h
@ -78,7 +75,7 @@ glibcxxinstall_HEADERS = $(headers)
# as the occasion call for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(LIBSUPCXX_PICFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)

5
libstdc++-v3/libsupc++/Makefile.in
View File

@ -200,6 +200,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
@ -223,8 +224,6 @@ toolexeclib_LTLIBRARIES = libsupc++.la
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la
LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@
headers = \
exception new typeinfo cxxabi.h exception_defines.h
@ -271,7 +270,7 @@ glibcxxinstall_HEADERS = $(headers)
# as the occasion call for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(LIBSUPCXX_PICFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)

1
libstdc++-v3/po/Makefile.am
View File

@ -21,6 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
include $(top_srcdir)/fragment.am
# Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale

27
libstdc++-v3/po/Makefile.in
View File

@ -196,6 +196,27 @@ target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \
$(SECTION_FLAGS) $(EXTRA_CXX_FLAGS)
WARN_CXXFLAGS = \
$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
# -I/-D flags to pass when compiling.
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale
locale_builddir = @glibcxx_localedir@
@ -218,18 +239,17 @@ DISTFILES = \
CLEANFILES = $(LOCALE_OUT)
subdir = po
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
depcomp =
am__depfiles_maybe =
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in
DIST_COMMON = $(top_srcdir)/fragment.am Makefile.am Makefile.in
all: all-am
.SUFFIXES:
.SUFFIXES: .po .mo
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/fragment.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign po/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
@ -255,6 +275,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
$(mkinstalldirs) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \

1
libstdc++-v3/src/Makefile.am
View File

@ -166,7 +166,6 @@ demangle.o: demangle.cc
# as the occasion calls for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)

2
libstdc++-v3/src/Makefile.in
View File

@ -201,6 +201,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)
@ -301,7 +302,6 @@ GLIBCXX_INCLUDE_DIR = @glibcxx_builddir@/include
# as the occasion calls for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)

1
libstdc++-v3/testsuite/Makefile.in
View File

@ -203,6 +203,7 @@ MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibcxx_toolexecdir)
toolexeclibdir = $(glibcxx_toolexeclibdir)