Skip to content

R
riscv-gcc-1
Commit 0df3f383 by Phil Edwards
Options

acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES. 

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

	* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES):  Remove LIBMATH_INCLUDES
	and LIBSUPCXX_INCLUDES.  Re-purpose TOPLEVEL_INCLUDES to refer to
	things from the top level.
	* configure.ac (GLIBCXX_IS_NATIVE):  Determine earlier and re-order.
	Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
	(currently unused).  Strip the fake-VPATH shell fragment from
	automake-generated rules, if present.
	* linkage.m4:  Add comment.

	* fragment.am:  New file, containing factored-out common settings.
	(AM_CPPFLAGS):  Absorb the deprecated INCLUDES variable contents.
	* Makefile.am:  Include fragment.am.  Remove common variables.
	* include/Makefile.am:  Likewise.
	* libmath/Makefile.am:  Likewise.
	* libsupc++/Makefile.am:  Likewise.
	* po/Makefile.am:  Likewise.  Print rules during check.
	* src/Makefile.am:  Likewise.
	* testsuite/Makefile.am:  Likewise.

	* aclocal.m4, configure, Makefile.in, include/Makefile.in,
	libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
	src/Makefile.in, testsuite/Makefile.in:  Regenerate.

From-SVN: r70522
parent dd61aa98
Showing with 271 additions and 329 deletions
libstdc++-v3/ChangeLog
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
2003-08-11 John Levon <levon@movementarian.org> 2003-08-11 John Levon <levon@movementarian.org>
* docs/html/ext/howto/guide.html (GLIBCXX_FORCE_NEW): Update * docs/html/ext/howto/guide.html (GLIBCXX_FORCE_NEW): Update
remaining places for the name change from GLIBCPP_FORCE_NEW remaining places for the name change from GLIBCPP_FORCE_NEW
to GLIBCXX_FORCE_NEW to GLIBCXX_FORCE_NEW
2003-08-11 Benjamin Kosnik <bkoz@redhat.com> 2003-08-11 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/basic_ios.h: Remove *_iter typedefs, change num* * include/bits/basic_ios.h: Remove *_iter typedefs, change num*
...@@ -62,7 +86,7 @@ ...@@ -62,7 +86,7 @@
2003-08-07 Carlo Wood <carlo@alinoe.com> 2003-08-07 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h: Do not use cctype functions that depend * include/bits/demangle.h: Do not use cctype functions that depend
on locale. on locale.
2003-08-05 Phil Edwards <pme@gcc.gnu.org> 2003-08-05 Phil Edwards <pme@gcc.gnu.org>
......
libstdc++-v3/Makefile.am
...@@ -22,14 +22,10 @@ ...@@ -22,14 +22,10 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
MAINT_CHARSET = latin1 include $(top_srcdir)/fragment.am
SUBDIRS = include libmath libsupc++ src po testsuite SUBDIRS = include libmath libsupc++ src po testsuite
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
# These rules are messy, but are hella worth it. # These rules are messy, but are hella worth it.
doxygen: doxygen:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
......
libstdc++-v3/Makefile.in
...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -205,12 +198,26 @@ toplevel_srcdir = @toplevel_srcdir@ ...@@ -205,12 +198,26 @@ toplevel_srcdir = @toplevel_srcdir@
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
SUBDIRS = include libmath libsupc++ src po testsuite
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
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)
SUBDIRS = include libmath libsupc++ src po testsuite
# Multilib support. # Multilib support.
MAKEOVERRIDES = MAKEOVERRIDES =
...@@ -281,13 +288,13 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ...@@ -281,13 +288,13 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
all-recursive install-data-recursive install-exec-recursive \ all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \ installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive check-recursive installcheck-recursive
DIST_COMMON = README ../ABOUT-NLS ../COPYING ../COPYING.LIB \ DIST_COMMON = README $(top_srcdir)/fragment.am ../ABOUT-NLS ../COPYING \
../ChangeLog ../README ../config.guess ../config.rpath \ ../COPYING.LIB ../ChangeLog ../README ../config.guess \
../config.sub ../configure ../configure.in ../install-sh \ ../config.rpath ../config.sub ../configure ../configure.in \
../ltcf-c.sh ../ltcf-cxx.sh ../ltcf-gcj.sh ../ltconfig \ ../install-sh ../ltcf-c.sh ../ltcf-cxx.sh ../ltcf-gcj.sh \
../ltmain.sh ../missing ../mkinstalldirs ../ylwrap ChangeLog \ ../ltconfig ../ltmain.sh ../missing ../mkinstalldirs ../ylwrap \
Makefile.am Makefile.in acconfig.h acinclude.m4 aclocal.m4 \ ChangeLog Makefile.am Makefile.in acconfig.h acinclude.m4 \
config.h.in configure configure.ac aclocal.m4 config.h.in configure configure.ac
DIST_SUBDIRS = $(SUBDIRS) DIST_SUBDIRS = $(SUBDIRS)
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
...@@ -296,7 +303,7 @@ all: config.h ...@@ -296,7 +303,7 @@ all: config.h
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.lineno
$(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) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile $(AUTOMAKE) --foreign Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
......
libstdc++-v3/acinclude.m4
...@@ -588,27 +588,27 @@ dnl ...@@ -588,27 +588,27 @@ dnl
dnl Substs: dnl Substs:
dnl GLIBCXX_INCLUDES dnl GLIBCXX_INCLUDES
dnl TOPLEVEL_INCLUDES dnl TOPLEVEL_INCLUDES
dnl LIBMATH_INCLUDES
dnl LIBSUPCXX_INCLUDES
dnl dnl
AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [ AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [
# Root level of the build directory include sources. # Used for every C++ compile we perform.
GLIBCXX_INCLUDES="-I$glibcxx_builddir/include/$host_alias -I$glibcxx_builddir/include" GLIBCXX_INCLUDES="\
-I$glibcxx_builddir/include/$host_alias \
-I$glibcxx_builddir/include \
-I$glibcxx_srcdir/libsupc++"
# Passed down for canadian crosses. # For Canadian crosses, pick this up too.
if test $CANADIAN = yes; then if test $CANADIAN = yes; then
TOPLEVEL_INCLUDES='-I${includedir}' GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES '-I${includedir}'"
fi fi
LIBMATH_INCLUDES='-I${glibcxx_srcdir}/libmath' # Stuff in the actual top level. Currently only used by libsupc++ to
# get unwind* headers from the gcc dir.
LIBSUPCXX_INCLUDES='-I${glibcxx_srcdir}/libsupc++' #TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include'
TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc'
# Now, export this to all the little Makefiles.... # Now, export this to all the little Makefiles....
AC_SUBST(GLIBCXX_INCLUDES) AC_SUBST(GLIBCXX_INCLUDES)
AC_SUBST(TOPLEVEL_INCLUDES) AC_SUBST(TOPLEVEL_INCLUDES)
AC_SUBST(LIBMATH_INCLUDES)
AC_SUBST(LIBSUPCXX_INCLUDES)
]) ])
......
libstdc++-v3/aclocal.m4
...@@ -601,27 +601,27 @@ dnl ...@@ -601,27 +601,27 @@ dnl
dnl Substs: dnl Substs:
dnl GLIBCXX_INCLUDES dnl GLIBCXX_INCLUDES
dnl TOPLEVEL_INCLUDES dnl TOPLEVEL_INCLUDES
dnl LIBMATH_INCLUDES
dnl LIBSUPCXX_INCLUDES
dnl dnl
AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [ AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [
# Root level of the build directory include sources. # Used for every C++ compile we perform.
GLIBCXX_INCLUDES="-I$glibcxx_builddir/include/$host_alias -I$glibcxx_builddir/include" GLIBCXX_INCLUDES="\
-I$glibcxx_builddir/include/$host_alias \
-I$glibcxx_builddir/include \
-I$glibcxx_srcdir/libsupc++"
# Passed down for canadian crosses. # For Canadian crosses, pick this up too.
if test $CANADIAN = yes; then if test $CANADIAN = yes; then
TOPLEVEL_INCLUDES='-I${includedir}' GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES '-I${includedir}'"
fi fi
LIBMATH_INCLUDES='-I${glibcxx_srcdir}/libmath' # Stuff in the actual top level. Currently only used by libsupc++ to
# get unwind* headers from the gcc dir.
LIBSUPCXX_INCLUDES='-I${glibcxx_srcdir}/libsupc++' #TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include'
TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc'
# Now, export this to all the little Makefiles.... # Now, export this to all the little Makefiles....
AC_SUBST(GLIBCXX_INCLUDES) AC_SUBST(GLIBCXX_INCLUDES)
AC_SUBST(TOPLEVEL_INCLUDES) AC_SUBST(TOPLEVEL_INCLUDES)
AC_SUBST(LIBMATH_INCLUDES)
AC_SUBST(LIBSUPCXX_INCLUDES)
]) ])
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure.ac
...@@ -39,6 +39,14 @@ target_alias=${target_alias-$host_alias} ...@@ -39,6 +39,14 @@ target_alias=${target_alias-$host_alias}
# Handy for debugging: # Handy for debugging:
#AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5 #AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5
if test "$build" != "$host"; then
# We are being configured with some form of cross compiler.
GLIBCXX_IS_NATIVE=false
GCC_NO_EXECUTABLES
else
GLIBCXX_IS_NATIVE=true
fi
# Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the # Sets up automake. Must come after AC_CANONICAL_SYSTEM. Each of the
# following is magically included in AUTOMAKE_OPTIONS in each Makefile.am. # following is magically included in AUTOMAKE_OPTIONS in each Makefile.am.
# 1.x: minimum required version # 1.x: minimum required version
...@@ -94,10 +102,46 @@ if test $atomicity_include_dir = cpu/generic ; then ...@@ -94,10 +102,46 @@ if test $atomicity_include_dir = cpu/generic ; then
fi fi
if test "$build" != "$host"; then if $GLIBCXX_IS_NATIVE; then
# We are being configured with some form of cross compiler. # We can do more elaborate tests that assume a working linker.
GLIBCXX_IS_NATIVE=false CANADIAN=no
# Check for available headers.
AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h \
sys/types.h])
GLIBCXX_CHECK_COMPILER_FEATURES
GLIBCXX_CHECK_LINKER_FEATURES
GLIBCXX_CHECK_MATH_SUPPORT
GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
GLIBCXX_CHECK_WCHAR_T_SUPPORT
GLIBCXX_CHECK_STDLIB_SUPPORT
# For showmanyc_helper().
AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
GLIBCXX_CHECK_POLL
GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
# For xsputn_2().
AC_CHECK_HEADERS(sys/uio.h)
GLIBCXX_CHECK_WRITEV
AC_LC_MESSAGES
AC_TRY_COMPILE(
[#include <setjmp.h>],
[sigjmp_buf env;
while (! sigsetjmp (env, 1))
siglongjmp (env, 1);
],
[AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available.])])
AC_FUNC_MMAP
else
# This lets us hard-code the functionality we know we'll have in the cross # This lets us hard-code the functionality we know we'll have in the cross
# target environment. "Let" is a sugar-coated word placed on an especially # target environment. "Let" is a sugar-coated word placed on an especially
...@@ -114,7 +158,7 @@ if test "$build" != "$host"; then ...@@ -114,7 +158,7 @@ if test "$build" != "$host"; then
# crosses can be removed. # crosses can be removed.
# If Canadian cross, then don't pick up tools from the build directory. # If Canadian cross, then don't pick up tools from the build directory.
# Used in GLIBCXX_EXPORT_INCLUDES (and nowhere else?). # Used only in GLIBCXX_EXPORT_INCLUDES.
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$build" != x"$with_cross_host" && test x"$build" != x"$with_cross_host" &&
test x"$build" != x"$target"; test x"$build" != x"$target";
...@@ -199,46 +243,6 @@ if test "$build" != "$host"; then ...@@ -199,46 +243,6 @@ if test "$build" != "$host"; then
AC_DEFINE(HAVE_TANHL) AC_DEFINE(HAVE_TANHL)
fi fi
else
# We are being configured natively. We can do more elaborate tests that
# include AC_TRY_COMPILE now, as the linker is assumed to be working.
GLIBCXX_IS_NATIVE=true
CANADIAN=no
# Check for available headers.
AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h \
sys/types.h])
GLIBCXX_CHECK_COMPILER_FEATURES
GLIBCXX_CHECK_LINKER_FEATURES
GLIBCXX_CHECK_MATH_SUPPORT
GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
GLIBCXX_CHECK_WCHAR_T_SUPPORT
GLIBCXX_CHECK_STDLIB_SUPPORT
# For showmanyc_helper().
AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
GLIBCXX_CHECK_POLL
GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
# For xsputn_2().
AC_CHECK_HEADERS(sys/uio.h)
GLIBCXX_CHECK_WRITEV
AC_LC_MESSAGES
AC_TRY_COMPILE(
[#include <setjmp.h>],
[sigjmp_buf env;
while (! sigsetjmp (env, 1))
siglongjmp (env, 1);
],
[AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available.])])
AC_FUNC_MMAP
fi fi
# This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no. # This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no.
...@@ -259,9 +263,9 @@ AC_SUBST(OS_INC_SRCDIR) ...@@ -259,9 +263,9 @@ AC_SUBST(OS_INC_SRCDIR)
# Determine cross-compile flags and AM_CONDITIONALs. # Determine cross-compile flags and AM_CONDITIONALs.
#AC_SUBST(GLIBCXX_IS_NATIVE) #AC_SUBST(GLIBCXX_IS_NATIVE)
AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes) #AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes)
# from GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT: # from GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT:
AM_CONDITIONAL(GLIBCXX_BUILD_LIBMATH, test $need_libmath = yes) #AM_CONDITIONAL(GLIBCXX_BUILD_LIBMATH, test $need_libmath = yes)
AC_CACHE_SAVE AC_CACHE_SAVE
...@@ -271,7 +275,7 @@ else ...@@ -271,7 +275,7 @@ else
multilib_arg= multilib_arg=
fi fi
# Export all the install information # Export all the install information.
GLIBCXX_EXPORT_INSTALL_INFO GLIBCXX_EXPORT_INSTALL_INFO
# Export all the include and flag information to Makefiles. # Export all the include and flag information to Makefiles.
...@@ -311,14 +315,22 @@ AC_CONFIG_COMMANDS([default], ...@@ -311,14 +315,22 @@ AC_CONFIG_COMMANDS([default],
# To work around this not being passed down from config-ml.in -> # To work around this not being passed down from config-ml.in ->
# srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually # srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
# append it here. Only modify Makefiles that have just been created. # append it here. Only modify Makefiles that have just been created.
for i in src libsupc++ testsuite; do #
# Also, get rid of this simulated-VPATH thing that automake does.
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
for i in libmath libsupc++ src testsuite; do
case $CONFIG_FILES in case $CONFIG_FILES in
*${i}/Makefile*) *${i}/Makefile*)
#echo "Adding MULTISUBDIR to $i/Makefile" #echo "Adding MULTISUBDIR to $i/Makefile"
grep '^MULTISUBDIR =' Makefile >> $i/Makefile sed -f vpsed $i/Makefile > tmp
grep '^MULTISUBDIR =' Makefile >> tmp
mv tmp $i/Makefile
;; ;;
esac esac
done done
rm vpsed
fi fi
(cd include && ${MAKE-make}) (cd include && ${MAKE-make})
], ],
......
libstdc++-v3/fragment.am 0 → 100644
## This is used in all Makefile.am's except for libmath's. Set defaults here.
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
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)
## vim:ft=automake
libstdc++-v3/include/Makefile.am
...@@ -21,17 +21,7 @@ ...@@ -21,17 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
MAINT_CHARSET = latin1 include $(top_srcdir)/fragment.am
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
# Cross compiler and multilib support.
glibcxx_srcdir=@glibcxx_srcdir@
glibcxx_builddir=@glibcxx_builddir@
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
INCLUDES = -nostdinc++ $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
# Standard C++ includes. # Standard C++ includes.
std_srcdir = ${glibcxx_srcdir}/include/std std_srcdir = ${glibcxx_srcdir}/include/std
...@@ -509,8 +499,8 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source} ...@@ -509,8 +499,8 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
if [ ! -d "${pch_output_builddir}" ]; then \ if [ ! -d "${pch_output_builddir}" ]; then \
mkdir -p ${pch_output_builddir}; \ mkdir -p ${pch_output_builddir}; \
fi; \ fi; \
$(CXX) $(PCHFLAGS) $(INCLUDES) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \ $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
$(CXX) $(PCHFLAGS) $(INCLUDES) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g; $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
# For robustness sake (in light of junk files or in-source # For robustness sake (in light of junk files or in-source
# configuration), copy from the build or source tree to the install # configuration), copy from the build or source tree to the install
......
libstdc++-v3/include/Makefile.in
...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -98,7 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@ ...@@ -98,7 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@
GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@ GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@
GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@
GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
...@@ -108,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -108,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -171,8 +163,6 @@ glibcxx_POFILES = @glibcxx_POFILES@ ...@@ -171,8 +163,6 @@ glibcxx_POFILES = @glibcxx_POFILES@
glibcxx_builddir = @glibcxx_builddir@ glibcxx_builddir = @glibcxx_builddir@
glibcxx_localedir = @glibcxx_localedir@ glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_prefixdir = @glibcxx_prefixdir@
# Cross compiler and multilib support.
glibcxx_srcdir = @glibcxx_srcdir@ glibcxx_srcdir = @glibcxx_srcdir@
# Host includes for threads # Host includes for threads
...@@ -220,7 +210,22 @@ toplevel_srcdir = @toplevel_srcdir@ ...@@ -220,7 +210,22 @@ toplevel_srcdir = @toplevel_srcdir@
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
INCLUDES = -nostdinc++ $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES) PWD_COMMAND = $${PWDCMD-pwd}
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)
# Standard C++ includes. # Standard C++ includes.
std_srcdir = ${glibcxx_srcdir}/include/std std_srcdir = ${glibcxx_srcdir}/include/std
...@@ -572,11 +577,11 @@ CONFIG_CLEAN_FILES = ...@@ -572,11 +577,11 @@ CONFIG_CLEAN_FILES =
depcomp = depcomp =
am__depfiles_maybe = am__depfiles_maybe =
DIST_SOURCES = DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = $(top_srcdir)/fragment.am Makefile.am Makefile.in
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
$(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) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile $(AUTOMAKE) --foreign include/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
...@@ -603,6 +608,7 @@ top_distdir = .. ...@@ -603,6 +608,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkinstalldirs) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
...@@ -850,8 +856,8 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source} ...@@ -850,8 +856,8 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
if [ ! -d "${pch_output_builddir}" ]; then \ if [ ! -d "${pch_output_builddir}" ]; then \
mkdir -p ${pch_output_builddir}; \ mkdir -p ${pch_output_builddir}; \
fi; \ fi; \
$(CXX) $(PCHFLAGS) $(INCLUDES) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \ $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
$(CXX) $(PCHFLAGS) $(INCLUDES) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g; $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
install-data-local: install-headers ${pch_install} install-data-local: install-headers ${pch_install}
......
libstdc++-v3/libmath/Makefile.am
## Makefile for the math subdirectory of the GNU C++ Standard library. ## Makefile for the math 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. ## Free Software Foundation, Inc.
## ##
## This file is part of the libstdc++ version 3 distribution. ## This file is part of the libstdc++ version 3 distribution.
...@@ -26,17 +26,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs ...@@ -26,17 +26,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_LIBADD = @LIBMATHOBJS@
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
libmath_la_SOURCES = stubs.c libmath_la_SOURCES = stubs.c
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES AM_CPPFLAGS = $(CANADIAN_INCLUDES)
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
INCLUDES = \
$(TOPLEVEL_INCLUDES)
# Only compiling "C" sources in this directory. # Only compiling "C" sources in this directory.
LIBTOOL = @LIBTOOL@ --tag CC LIBTOOL = @LIBTOOL@ --tag CC
libstdc++-v3/libmath/Makefile.in
...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
# Only compiling "C" sources in this directory. # Only compiling "C" sources in this directory.
...@@ -142,8 +135,6 @@ SET_MAKE = @SET_MAKE@ ...@@ -142,8 +135,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
SYMVER_MAP = @SYMVER_MAP@ SYMVER_MAP = @SYMVER_MAP@
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
...@@ -211,15 +202,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs ...@@ -211,15 +202,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_LIBADD = @LIBMATHOBJS@
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
libmath_la_SOURCES = stubs.c libmath_la_SOURCES = stubs.c
INCLUDES = \ AM_CPPFLAGS = $(CANADIAN_INCLUDES)
$(TOPLEVEL_INCLUDES)
subdir = libmath subdir = libmath
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_HEADER = $(top_builddir)/config.h CONFIG_HEADER = $(top_builddir)/config.h
......
libstdc++-v3/libsupc++/Makefile.am
...@@ -21,15 +21,7 @@ ...@@ -21,15 +21,7 @@
## the Free Software Foundation, 59 Temple Place - Suite 330, ## the Free Software Foundation, 59 Temple Place - Suite 330,
## Boston, MA 02111-1307, USA. ## Boston, MA 02111-1307, USA.
MAINT_CHARSET = latin1 include $(top_srcdir)/fragment.am
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
# Cross compiler and multilib support.
CC = @CC@
toolexecdir = @glibcxx_toolexecdir@
toolexeclibdir = @glibcxx_toolexeclibdir@
# Need this library to both be part of libstdc++.a, and installed # Need this library to both be part of libstdc++.a, and installed
# separately too. # separately too.
...@@ -39,30 +31,9 @@ toolexeclib_LTLIBRARIES = libsupc++.la ...@@ -39,30 +31,9 @@ toolexeclib_LTLIBRARIES = libsupc++.la
noinst_LTLIBRARIES = libsupc++convenience.la noinst_LTLIBRARIES = libsupc++convenience.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \
@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
INCLUDES = \
$(GCC_INCLUDES) $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
headers = \ headers = \
exception new typeinfo cxxabi.h exception_defines.h exception new typeinfo cxxabi.h exception_defines.h
...@@ -137,7 +108,7 @@ AM_MAKEFLAGS = \ ...@@ -137,7 +108,7 @@ AM_MAKEFLAGS = \
# We have to put --tag disable-shared after --tag CXX lest things # We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared. # CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=compile $(CXX) $(INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We'd have a problem when building the shared libstdc++ object if # 3) We'd have a problem when building the shared libstdc++ object if
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -49,10 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,10 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
# Cross compiler and multilib support.
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -88,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -88,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -100,8 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@ ...@@ -100,8 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@
GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@ GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@
GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@
GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
...@@ -111,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -111,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -127,9 +116,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ...@@ -127,9 +116,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
OS_INC_SRCDIR = @OS_INC_SRCDIR@ OS_INC_SRCDIR = @OS_INC_SRCDIR@
...@@ -213,34 +199,31 @@ toplevel_srcdir = @toplevel_srcdir@ ...@@ -213,34 +199,31 @@ toplevel_srcdir = @toplevel_srcdir@
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
toolexecdir = @glibcxx_toolexecdir@ PWD_COMMAND = $${PWDCMD-pwd}
toolexeclibdir = @glibcxx_toolexeclibdir@
# Need this library to both be part of libstdc++.a, and installed toolexecdir = $(glibcxx_toolexecdir)
# separately too. toolexeclibdir = $(glibcxx_toolexeclibdir)
# 1) separate libsupc++.la
toolexeclib_LTLIBRARIES = libsupc++.la
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la
# These bits are all figured out from configure. Look in acinclude.m4 # These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS)
# Warning flags to use.
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@ # -I/-D flags to pass when compiling.
GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
INCLUDES = \ # Need this library to both be part of libstdc++.a, and installed
$(GCC_INCLUDES) $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES) # separately too.
# 1) separate libsupc++.la
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 = \ headers = \
exception new typeinfo cxxabi.h exception_defines.h exception new typeinfo cxxabi.h exception_defines.h
...@@ -320,7 +303,7 @@ AM_MAKEFLAGS = \ ...@@ -320,7 +303,7 @@ AM_MAKEFLAGS = \
# We have to put --tag disable-shared after --tag CXX lest things # We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared. # CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=compile $(CXX) $(INCLUDES) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
...@@ -365,14 +348,15 @@ DIST_SOURCES = $(libsupc___la_SOURCES) \ ...@@ -365,14 +348,15 @@ DIST_SOURCES = $(libsupc___la_SOURCES) \
$(libsupc__convenience_la_SOURCES) $(libsupc__convenience_la_SOURCES)
HEADERS = $(glibcxxinstall_HEADERS) HEADERS = $(glibcxxinstall_HEADERS)
DIST_COMMON = $(glibcxxinstall_HEADERS) Makefile.am Makefile.in DIST_COMMON = $(glibcxxinstall_HEADERS) $(top_srcdir)/fragment.am \
Makefile.am Makefile.in
SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES) SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .lo .o .obj .SUFFIXES: .cc .lo .o .obj
$(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) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign libsupc++/Makefile $(AUTOMAKE) --foreign libsupc++/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
...@@ -504,6 +488,7 @@ top_distdir = .. ...@@ -504,6 +488,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkinstalldirs) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
......
libstdc++-v3/linkage.m4
...@@ -497,6 +497,7 @@ AC_DEFUN(GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -497,6 +497,7 @@ AC_DEFUN(GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT, [
AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"]) AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
fi fi
# XXX Review this. Nothing uses it.
if test -n "$LIBMATHOBJS"; then if test -n "$LIBMATHOBJS"; then
need_libmath=yes need_libmath=yes
fi fi
......
libstdc++-v3/po/Makefile.am
## Makefile for the po subdirectory of the GNU C++ Standard library. ## Makefile for the po subdirectory of the GNU C++ Standard library.
## ##
## Copyright (C) 2001 Free Software Foundation, Inc. ## Copyright (C) 2001, 2003 Free Software Foundation, Inc.
## ##
## This file is part of the libstdc++ version 3 distribution. ## This file is part of the libstdc++ version 3 distribution.
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
...@@ -21,11 +21,8 @@ ...@@ -21,11 +21,8 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
PACKAGE = @PACKAGE@
glibcxx_srcdir = @glibcxx_srcdir@
# Location of installation directories. # Location of installation directories.
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
locale_installdir = $(DESTDIR)$(datadir)/locale locale_installdir = $(DESTDIR)$(datadir)/locale
locale_builddir = @glibcxx_localedir@ locale_builddir = @glibcxx_localedir@
...@@ -53,8 +50,8 @@ all-local-yes: $(LOCALE_OUT) ...@@ -53,8 +50,8 @@ all-local-yes: $(LOCALE_OUT)
check: check-@USE_NLS@ check: check-@USE_NLS@
check-no: check-no:
check-yes: check-yes:
@$(mkinstalldirs) $(locale_builddir) $(mkinstalldirs) $(locale_builddir)
@catalogs='$(LOCALE_OUT)'; \ catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.mo$$//'`; \ lang=`echo $$cat | sed 's/\.mo$$//'`; \
...@@ -69,7 +66,7 @@ install-data-local: install-data-local-@USE_NLS@ ...@@ -69,7 +66,7 @@ install-data-local: install-data-local-@USE_NLS@
install-data-local-no: install-data-local-no:
install-data-local-yes: all-local-yes install-data-local-yes: all-local-yes
$(mkinstalldirs) $(locale_installdir) $(mkinstalldirs) $(locale_installdir)
@catalogs='$(LOCALE_OUT)'; \ catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.mo$$//'`; \ lang=`echo $$cat | sed 's/\.mo$$//'`; \
......
libstdc++-v3/po/Makefile.in
...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -126,7 +119,6 @@ OBJEXT = @OBJEXT@ ...@@ -126,7 +119,6 @@ OBJEXT = @OBJEXT@
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
OS_INC_SRCDIR = @OS_INC_SRCDIR@ OS_INC_SRCDIR = @OS_INC_SRCDIR@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
...@@ -205,7 +197,6 @@ target_vendor = @target_vendor@ ...@@ -205,7 +197,6 @@ target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@ toplevel_srcdir = @toplevel_srcdir@
# Location of installation directories. # Location of installation directories.
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
locale_installdir = $(DESTDIR)$(datadir)/locale locale_installdir = $(DESTDIR)$(datadir)/locale
locale_builddir = @glibcxx_localedir@ locale_builddir = @glibcxx_localedir@
...@@ -227,6 +218,7 @@ DISTFILES = \ ...@@ -227,6 +218,7 @@ DISTFILES = \
CLEANFILES = $(LOCALE_OUT) CLEANFILES = $(LOCALE_OUT)
subdir = po subdir = po
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
depcomp = depcomp =
...@@ -385,8 +377,8 @@ all-local-yes: $(LOCALE_OUT) ...@@ -385,8 +377,8 @@ all-local-yes: $(LOCALE_OUT)
check: check-@USE_NLS@ check: check-@USE_NLS@
check-no: check-no:
check-yes: check-yes:
@$(mkinstalldirs) $(locale_builddir) $(mkinstalldirs) $(locale_builddir)
@catalogs='$(LOCALE_OUT)'; \ catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.mo$$//'`; \ lang=`echo $$cat | sed 's/\.mo$$//'`; \
...@@ -401,7 +393,7 @@ install-data-local: install-data-local-@USE_NLS@ ...@@ -401,7 +393,7 @@ install-data-local: install-data-local-@USE_NLS@
install-data-local-no: install-data-local-no:
install-data-local-yes: all-local-yes install-data-local-yes: all-local-yes
$(mkinstalldirs) $(locale_installdir) $(mkinstalldirs) $(locale_installdir)
@catalogs='$(LOCALE_OUT)'; \ catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.mo$$//'`; \ lang=`echo $$cat | sed 's/\.mo$$//'`; \
......
libstdc++-v3/src/Makefile.am
...@@ -22,26 +22,20 @@ ...@@ -22,26 +22,20 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
MAINT_CHARSET = latin1 include $(top_srcdir)/fragment.am
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
# Cross compiler support. # Cross compiler support.
glibcxx_srcdir=@glibcxx_srcdir@
glibcxx_builddir=@glibcxx_builddir@
toolexecdir = @glibcxx_toolexecdir@
toolexeclibdir = @glibcxx_toolexeclibdir@
toolexeclib_LTLIBRARIES = libstdc++.la toolexeclib_LTLIBRARIES = libstdc++.la
# Symbol versioning for shared libraries. # Symbol versioning for shared libraries.
if GLIBCXX_BUILD_VERSIONED_SHLIB if GLIBCXX_BUILD_VERSIONED_SHLIB
version_arg = -Wl,--version-script=libstdc++-symbol.ver version_arg = -Wl,--version-script=libstdc++-symbol.ver
libstdc++-symbol.ver: ${glibcxx_srcdir}/@SYMVER_MAP@ libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP)
cp ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
if test "x@port_specific_symbol_files@" != x; then \ if test "x$(port_specific_symbol_files)" != x; then \
sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \ sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \ sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
cat tmp.top @port_specific_symbol_files@ tmp.bottom > $@; \ cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
rm tmp.top tmp.bottom; \ rm tmp.top tmp.bottom; \
fi fi
else else
...@@ -49,30 +43,6 @@ version_arg = ...@@ -49,30 +43,6 @@ version_arg =
libstdc++-symbol.ver: libstdc++-symbol.ver:
endif endif
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
CONFIG_CXXFLAGS = \
@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
INCLUDES = \
-nostdinc++ \
$(GLIBCXX_INCLUDES) \
$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
$(TOPLEVEL_INCLUDES)
# Source files linked in via configuration/make substitution for a # Source files linked in via configuration/make substitution for a
# particular host. # particular host.
......
libstdc++-v3/src/Makefile.in
...@@ -50,8 +50,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -50,8 +50,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -87,8 +85,6 @@ FPOS_H = @FPOS_H@ ...@@ -87,8 +85,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -99,8 +95,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@ ...@@ -99,8 +95,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@
GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@ GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@
GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@
GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
...@@ -110,12 +104,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -110,12 +104,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -126,9 +117,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ...@@ -126,9 +117,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
OS_INC_SRCDIR = @OS_INC_SRCDIR@ OS_INC_SRCDIR = @OS_INC_SRCDIR@
...@@ -176,8 +164,6 @@ glibcxx_POFILES = @glibcxx_POFILES@ ...@@ -176,8 +164,6 @@ glibcxx_POFILES = @glibcxx_POFILES@
glibcxx_builddir = @glibcxx_builddir@ glibcxx_builddir = @glibcxx_builddir@
glibcxx_localedir = @glibcxx_localedir@ glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_prefixdir = @glibcxx_prefixdir@
# Cross compiler support.
glibcxx_srcdir = @glibcxx_srcdir@ glibcxx_srcdir = @glibcxx_srcdir@
glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_thread_h = @glibcxx_thread_h@
glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexecdir = @glibcxx_toolexecdir@
...@@ -214,31 +200,29 @@ toplevel_srcdir = @toplevel_srcdir@ ...@@ -214,31 +200,29 @@ toplevel_srcdir = @toplevel_srcdir@
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
toolexecdir = @glibcxx_toolexecdir@ PWD_COMMAND = $${PWDCMD-pwd}
toolexeclibdir = @glibcxx_toolexeclibdir@
toolexeclib_LTLIBRARIES = libstdc++.la
# Symbol versioning for shared libraries. toolexecdir = $(glibcxx_toolexecdir)
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=libstdc++-symbol.ver toolexeclibdir = $(glibcxx_toolexeclibdir)
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
# These bits are all figured out from configure. Look in acinclude.m4 # These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS.
CONFIG_CXXFLAGS = \ CONFIG_CXXFLAGS = \
@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS)
# Warning flags to use.
WARN_CXXFLAGS = \ WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
# -I/-D flags to pass when compiling.
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
INCLUDES = \ # Cross compiler support.
-nostdinc++ \ toolexeclib_LTLIBRARIES = libstdc++.la
$(GLIBCXX_INCLUDES) \
$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
$(TOPLEVEL_INCLUDES)
# Symbol versioning for shared libraries.
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=libstdc++-symbol.ver
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
# Source files linked in via configuration/make substitution for a # Source files linked in via configuration/make substitution for a
# particular host. # particular host.
...@@ -384,14 +368,14 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ...@@ -384,14 +368,14 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX) CXXLD = $(CXX)
DIST_SOURCES = $(libstdc___la_SOURCES) DIST_SOURCES = $(libstdc___la_SOURCES)
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = $(top_srcdir)/fragment.am Makefile.am Makefile.in
SOURCES = $(libstdc___la_SOURCES) SOURCES = $(libstdc___la_SOURCES)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .lo .o .obj .SUFFIXES: .cc .lo .o .obj
$(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) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile $(AUTOMAKE) --foreign src/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
...@@ -511,6 +495,7 @@ top_distdir = .. ...@@ -511,6 +495,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkinstalldirs) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
...@@ -627,12 +612,12 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES ...@@ -627,12 +612,12 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
tags uninstall uninstall-am uninstall-info-am \ tags uninstall uninstall-am uninstall-info-am \
uninstall-toolexeclibLTLIBRARIES uninstall-toolexeclibLTLIBRARIES
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcxx_srcdir}/@SYMVER_MAP@ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP)
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cp ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ if test "x@port_specific_symbol_files@" != x; then \ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ if test "x$(port_specific_symbol_files)" != x; then \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cat tmp.top @port_specific_symbol_files@ tmp.bottom > $@; \ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ rm tmp.top tmp.bottom; \ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ rm tmp.top tmp.bottom; \
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ fi @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ fi
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver: @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
......
libstdc++-v3/testsuite/Makefile.am
...@@ -23,15 +23,12 @@ ...@@ -23,15 +23,12 @@
AUTOMAKE_OPTIONS = dejagnu AUTOMAKE_OPTIONS = dejagnu
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs include $(top_srcdir)/fragment.am
AM_MAKEFLAGS = -j1 AM_MAKEFLAGS = -j1
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
PWD_COMMAND = $${PWDCMD-pwd}
## CXX is actually a "C" compiler. These are real C++ programs. ## CXX is actually a "C" compiler. These are real C++ programs.
glibcxx_srcdir=@glibcxx_srcdir@
glibcxx_builddir=@glibcxx_builddir@
testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
CXX=`${testsuite_flags_script} --build-cxx` CXX=`${testsuite_flags_script} --build-cxx`
...@@ -40,13 +37,6 @@ CXXLINK = \ ...@@ -40,13 +37,6 @@ CXXLINK = \
$(LIBTOOL) --tag=CXX --mode=link $(CXX) \ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
INCLUDES = \
-nostdinc++ \
@GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
# Generated lists of files to run. All of these names are valid make # Generated lists of files to run. All of these names are valid make
# targets, if you wish to generate a list manually. # targets, if you wish to generate a list manually.
lists_of_files = \ lists_of_files = \
......
libstdc++-v3/testsuite/Makefile.in
...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ ...@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_CC = @BASIC_FILE_CC@
BASIC_FILE_H = @BASIC_FILE_H@ BASIC_FILE_H = @BASIC_FILE_H@
CANADIAN_FALSE = @CANADIAN_FALSE@
CANADIAN_TRUE = @CANADIAN_TRUE@
CC = @CC@ CC = @CC@
CCODECVT_CC = @CCODECVT_CC@ CCODECVT_CC = @CCODECVT_CC@
CCODECVT_H = @CCODECVT_H@ CCODECVT_H = @CCODECVT_H@
...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ ...@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@ GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@ GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
...@@ -98,7 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@ ...@@ -98,7 +94,6 @@ GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@
GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@ GLIBCXX_C_HEADERS_C_STD_FALSE = @GLIBCXX_C_HEADERS_C_STD_FALSE@
GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@
GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
...@@ -108,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ ...@@ -108,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
...@@ -172,7 +164,6 @@ glibcxx_POFILES = @glibcxx_POFILES@ ...@@ -172,7 +164,6 @@ glibcxx_POFILES = @glibcxx_POFILES@
glibcxx_builddir = @glibcxx_builddir@ glibcxx_builddir = @glibcxx_builddir@
glibcxx_localedir = @glibcxx_localedir@ glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_prefixdir = @glibcxx_prefixdir@
glibcxx_srcdir = @glibcxx_srcdir@ glibcxx_srcdir = @glibcxx_srcdir@
glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_thread_h = @glibcxx_thread_h@
glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexecdir = @glibcxx_toolexecdir@
...@@ -208,11 +199,29 @@ toplevel_srcdir = @toplevel_srcdir@ ...@@ -208,11 +199,29 @@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = dejagnu AUTOMAKE_OPTIONS = dejagnu
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
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)
AM_MAKEFLAGS = -j1 AM_MAKEFLAGS = -j1
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
PWD_COMMAND = $${PWDCMD-pwd}
testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags
CXXLINK = \ CXXLINK = \
...@@ -220,10 +229,6 @@ CXXLINK = \ ...@@ -220,10 +229,6 @@ CXXLINK = \
$(LIBTOOL) --tag=CXX --mode=link $(CXX) \ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
INCLUDES = \
-nostdinc++ \
@GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
# Generated lists of files to run. All of these names are valid make # Generated lists of files to run. All of these names are valid make
# targets, if you wish to generate a list manually. # targets, if you wish to generate a list manually.
...@@ -290,14 +295,14 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ...@@ -290,14 +295,14 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX) CXXLD = $(CXX)
DIST_SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES) DIST_SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = $(top_srcdir)/fragment.am Makefile.am Makefile.in
SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES) SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .lo .o .obj .SUFFIXES: .cc .lo .o .obj
$(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) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --foreign testsuite/Makefile $(AUTOMAKE) --foreign testsuite/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
...@@ -445,6 +450,7 @@ top_distdir = .. ...@@ -445,6 +450,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkinstalldirs) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment