mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-23 19:03:59 +08:00
Makefile.am (toolexeclibdir): Add support fo VERSION_SPECIFIC_LIBS and --with-gxx-include-dir.
2000-10-13 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Mark Harig <markh@landmark.com>
* src/Makefile.am (toolexeclibdir): Add support fo
VERSION_SPECIFIC_LIBS and --with-gxx-include-dir.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Same.
(glibcppinstalldir): Adjust.
* libsupc++/Makefile.in: Regenerate.
* Makefile.am: Remove gxx_include_dir. Remove INCLUDE.
* Makefile.in: Regenerate.
* docs/configopts.html: Add descriptions of flags.
Co-Authored-By: Mark Harig <markh@landmark.com>
From-SVN: r36872
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
4ccd4a7633
commit
1fd2f51018
@ -1,3 +1,16 @@
|
||||
2000-10-13 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
|
||||
Mark Harig <markh@landmark.com>
|
||||
|
||||
* src/Makefile.am (toolexeclibdir): Add support fo
|
||||
VERSION_SPECIFIC_LIBS and --with-gxx-include-dir.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* libsupc++/Makefile.am: Same.
|
||||
(glibcppinstalldir): Adjust.
|
||||
* libsupc++/Makefile.in: Regenerate.
|
||||
* Makefile.am: Remove gxx_include_dir. Remove INCLUDE.
|
||||
* Makefile.in: Regenerate.
|
||||
* docs/configopts.html: Add descriptions of flags.
|
||||
|
||||
2000-10-11 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
|
||||
|
||||
* libsupc++/Makefile.am: Use it.
|
||||
|
||||
@ -24,11 +24,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
MAINT_CHARSET = latin1
|
||||
|
||||
# This helps subvert libstdcxx_interface, as calculated by devo/config.if
|
||||
# Needed so that g++ can find the correct include subdir automatically.
|
||||
INTERFACE = v3
|
||||
gxx_include_dir=$(includedir)/g++
|
||||
|
||||
SUBDIRS = libio libmath libsupc++ src
|
||||
|
||||
|
||||
|
||||
@ -106,18 +106,16 @@ VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
gcc_version = @gcc_version@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
libstdcxx_interface = @libstdcxx_interface@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
MAINT_CHARSET = latin1
|
||||
|
||||
# This helps subvert libstdcxx_interface, as calculated by devo/config.if
|
||||
# Needed so that g++ can find the correct include subdir automatically.
|
||||
INTERFACE = v3
|
||||
gxx_include_dir = $(includedir)/g++
|
||||
|
||||
SUBDIRS = libio libmath libsupc++ src
|
||||
|
||||
# Multilib support.
|
||||
|
||||
@ -1230,8 +1230,8 @@ dnl
|
||||
AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
|
||||
AC_MSG_CHECKING([for cstdio to use])
|
||||
AC_ARG_ENABLE(cstdio,
|
||||
[ --enable-cstdio enable GNU libio for target io package. (default)
|
||||
--enable-cstdio=LIB use LIB target-speific io package.],
|
||||
[ --enable-cstdio enable GNU libio for target io package. (default)
|
||||
--enable-cstdio=LIB use LIB target-speific io package.],
|
||||
if test x$enable_cstdio = xno; then
|
||||
enable_cstdio=libio
|
||||
fi,
|
||||
@ -1331,7 +1331,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
|
||||
AC_MSG_CHECKING([for threads package to use])
|
||||
AC_ARG_ENABLE(threads,
|
||||
[ --enable-threads enable thread usage for target GCC.
|
||||
--enable-threads=LIB use LIB thread package for target GCC.],
|
||||
--enable-threads=LIB use LIB thread package for target GCC.],
|
||||
if test x$enable_threads = xno; then
|
||||
enable_threads=''
|
||||
fi,
|
||||
|
||||
6
libstdc++-v3/aclocal.m4
vendored
6
libstdc++-v3/aclocal.m4
vendored
@ -1242,8 +1242,8 @@ dnl
|
||||
AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
|
||||
AC_MSG_CHECKING([for cstdio to use])
|
||||
AC_ARG_ENABLE(cstdio,
|
||||
[ --enable-cstdio enable GNU libio for target io package. (default)
|
||||
--enable-cstdio=LIB use LIB target-speific io package.],
|
||||
[ --enable-cstdio enable GNU libio for target io package. (default)
|
||||
--enable-cstdio=LIB use LIB target-speific io package.],
|
||||
if test x$enable_cstdio = xno; then
|
||||
enable_cstdio=libio
|
||||
fi,
|
||||
@ -1343,7 +1343,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
|
||||
AC_MSG_CHECKING([for threads package to use])
|
||||
AC_ARG_ENABLE(threads,
|
||||
[ --enable-threads enable thread usage for target GCC.
|
||||
--enable-threads=LIB use LIB thread package for target GCC.],
|
||||
--enable-threads=LIB use LIB thread package for target GCC.],
|
||||
if test x$enable_threads = xno; then
|
||||
enable_threads=''
|
||||
fi,
|
||||
|
||||
2147
libstdc++-v3/configure
vendored
2147
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -66,46 +66,46 @@ if test -n "$with_cross_host"; then
|
||||
# currently calling it.
|
||||
AC_DEFINE(HAVE_FLOAT_H)
|
||||
|
||||
AC_DEFINE(HAVE__FINITE)
|
||||
AC_DEFINE(HAVE__ISNAN)
|
||||
AC_DEFINE(HAVE__COPYSIGN)
|
||||
AC_DEFINE(HAVE__FPCLASS)
|
||||
AC_DEFINE(HAVE_MODF)
|
||||
AC_DEFINE(HAVE__FINITE)
|
||||
AC_DEFINE(HAVE__ISNAN)
|
||||
AC_DEFINE(HAVE__COPYSIGN)
|
||||
AC_DEFINE(HAVE__FPCLASS)
|
||||
AC_DEFINE(HAVE_MODF)
|
||||
|
||||
ctype_include_dir="config/os/wince"
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
|
||||
ctype_include_dir="config/os/wince"
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
|
||||
bits/ctype_inline.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
|
||||
bits/ctype_noninline.h)
|
||||
|
||||
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
|
||||
;;
|
||||
*)
|
||||
# We assume newlib. This lets us hard-code the functions we know
|
||||
# we'll have.
|
||||
AC_DEFINE(HAVE_FINITE)
|
||||
AC_DEFINE(HAVE_ISNAN)
|
||||
AC_DEFINE(HAVE_ISNANF)
|
||||
AC_DEFINE(HAVE_ISINF)
|
||||
AC_DEFINE(HAVE_ISINFF)
|
||||
AC_DEFINE(HAVE_FINITE)
|
||||
AC_DEFINE(HAVE_ISNAN)
|
||||
AC_DEFINE(HAVE_ISNANF)
|
||||
AC_DEFINE(HAVE_ISINF)
|
||||
AC_DEFINE(HAVE_ISINFF)
|
||||
|
||||
ctype_include_dir="config/os/newlib"
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
|
||||
ctype_include_dir="config/os/newlib"
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
|
||||
bits/ctype_inline.h)
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
|
||||
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
|
||||
bits/ctype_noninline.h)
|
||||
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
|
||||
# need to ceck for faster f versions of math functions, ie sinf?
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
|
||||
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
|
||||
# need to ceck for faster f versions of math functions, ie sinf?
|
||||
;;
|
||||
esac
|
||||
else
|
||||
@ -152,6 +152,62 @@ fi
|
||||
|
||||
# Generate the various Makefiles, include files, and scripts.
|
||||
|
||||
# This helps subvert libstdcxx_interface, as calculated by devo/config.if
|
||||
# Needed so that g++ can find the correct include subdir automatically.
|
||||
INTERFACE=v3
|
||||
|
||||
# Check for the interface version number for specifying where header
|
||||
# files are installed, if a version number is provided.
|
||||
AC_MSG_CHECKING([for interface version number])
|
||||
libstdcxx_interface=$INTERFACE
|
||||
AC_MSG_RESULT($libstdcxx_interface)
|
||||
AC_SUBST(libstdcxx_interface)
|
||||
|
||||
# Process the option --with-gxx-include-dir=<path to include-files directory>
|
||||
AC_MSG_CHECKING([for --with-gxx-include-dir])
|
||||
AC_ARG_WITH(gxx-include-dir,
|
||||
[ --with-gxx-include-dir the installation directory for include files],
|
||||
[case "${withval}" in
|
||||
yes)
|
||||
AC_MSG_ERROR(Missing directory for --with-gxx-include-dir)
|
||||
gxx_include_dir=no
|
||||
;;
|
||||
no)
|
||||
gxx_include_dir=no
|
||||
;;
|
||||
*)
|
||||
gxx_include_dir=${withval}
|
||||
;;
|
||||
esac], [gxx_include_dir=no])
|
||||
AC_MSG_RESULT($gxx_include_dir)
|
||||
AC_SUBST(gxx_include_dir)
|
||||
AM_CONDITIONAL(GXX_INCLUDE_DIR, test x${gxx_include_dir} != xno)
|
||||
|
||||
# Process the option "--enable-version-specific-runtime-libs"
|
||||
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
||||
AC_ARG_ENABLE(version-specific-runtime-libs,
|
||||
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
|
||||
[ version_specific_libs=yes
|
||||
# Need the gcc compiler version to know where to install libraries
|
||||
# and header files if --enable-version-specific-runtime-libs option
|
||||
# is selected.
|
||||
changequote(,)dnl
|
||||
gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
|
||||
gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
|
||||
#gcc_date=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $7}'`
|
||||
#gcc_version=$gcc_num-$gcc_date
|
||||
gcc_version=$gcc_num
|
||||
changequote([,])dnl
|
||||
AC_SUBST(gcc_version)
|
||||
],version_specific_libs=no)
|
||||
AC_MSG_RESULT($version_specific_libs)
|
||||
if test x${version_specific_libs} = xyes; then
|
||||
AM_CONDITIONAL(VERSION_SPECIFIC_LIBS, test x${version_specific_libs} = xyes)
|
||||
AC_MSG_WARN(version specific directory is: $gcc_version)
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Export all the include and flag information to makefiles.
|
||||
GLIBCPP_EXPORT_INCLUDES
|
||||
GLIBCPP_EXPORT_FLAGS
|
||||
@ -184,18 +240,17 @@ blddir=`pwd`
|
||||
AC_OUTPUT_COMMANDS([$srcdir/mkc++config $blddir $srcdir])
|
||||
|
||||
# Generate bits/std_limits.h and src/limitsMEMBERS.cc
|
||||
AC_OUTPUT_COMMANDS([$srcdir/mknumeric_limits $blddir $srcdir $xcompiling])
|
||||
|
||||
if test ! -f stamp-limits; then
|
||||
AC_OUTPUT_COMMANDS([$srcdir/mknumeric_limits $blddir $srcdir $xcompiling])
|
||||
touch stamp-limits
|
||||
fi
|
||||
|
||||
# Sanity checking & User-visible messages.
|
||||
# Checks down here, otherwise they get scrolled off before
|
||||
# the user will notice.
|
||||
if test "$enable_namespaces" = "yes" && test "$enable_libgcc_rebuild" = "no"
|
||||
then
|
||||
if test "$enable_libgcc_rebuild" = "no"; then
|
||||
AC_MSG_WARN([libgcc.a will not match mangled symbols unless it is rebuilt])
|
||||
fi
|
||||
if test "$enable_namespaces" = "no" && test "$enable_libgcc_rebuild" != "no"
|
||||
then
|
||||
else
|
||||
# Other things besides namespaces can make this true as well, but none
|
||||
# of them are done automatically... yet
|
||||
AC_MSG_WARN([no point in rebuilding libgcc.a if namespaces aren't used])
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<TITLE>libstdc++-v3 configure options</TITLE>
|
||||
<LINK REL="home" HREF="http://sources.redhat.com/libstdc++/">
|
||||
<LINK REL=StyleSheet HREF="lib3styles.css">
|
||||
<!-- $Id: configopts.html,v 1.8 2000/08/28 18:41:24 pme Exp $ -->
|
||||
<!-- $Id: configopts.html,v 1.9 2000/10/09 08:55:05 bkoz Exp $ -->
|
||||
</HEAD>
|
||||
<BODY>
|
||||
|
||||
@ -128,6 +128,19 @@ options</A></H1>
|
||||
and this option has been removed.
|
||||
</P>
|
||||
|
||||
<DT><TT>--enable-version-specific-runtime-libs</TT>
|
||||
<DD><P>Uses the compiler file "gcc/version.c" to determine the
|
||||
compiler version.
|
||||
</P>
|
||||
|
||||
<DT><TT>--with-gxx-include-dir=<include-files dir></TT>
|
||||
<DD><P> Adds support for named libstdc++ include directory.
|
||||
For instance, the following puts all the libstdc++ headers into a directory called "2.97-20001008" instead of the usual "g++-v3"
|
||||
<TT>
|
||||
--with-gxx-include-dir=/mnt/hd/bliss/H-x86-gcc-3-c-gxx-inc/include/2.97-20001008</TT>
|
||||
</P>
|
||||
|
||||
|
||||
<DT><TT>--enable-cxx-flags=FLAGS</TT>
|
||||
<DD><P>With this option, you can pass a string of -f (functionality)
|
||||
flags to the compiler to use when building libstdc++. FLAGS
|
||||
@ -172,7 +185,7 @@ options</A></H1>
|
||||
|
||||
<HR>
|
||||
<P CLASS="fineprint"><EM>
|
||||
$Id: configopts.html,v 1.8 2000/08/28 18:41:24 pme Exp $
|
||||
$Id: configopts.html,v 1.9 2000/10/09 08:55:05 bkoz Exp $
|
||||
</EM></P>
|
||||
|
||||
|
||||
|
||||
@ -99,9 +99,12 @@ VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
gcc_version = @gcc_version@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
libstdcxx_interface = @libstdcxx_interface@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
|
||||
|
||||
@ -99,9 +99,12 @@ VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
gcc_version = @gcc_version@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
libstdcxx_interface = @libstdcxx_interface@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
|
||||
|
||||
@ -29,9 +29,15 @@ MAINT_CHARSET = latin1
|
||||
if USE_LIBDIR
|
||||
toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
||||
else
|
||||
if VERSION_SPECIFIC_LIBS
|
||||
gcc_version = @gcc_version@
|
||||
toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
||||
toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
||||
else
|
||||
toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
# Need this library to both be part of libstdc++.a, and installed
|
||||
@ -92,8 +98,17 @@ sources = \
|
||||
libsupc___la_SOURCES = $(sources)
|
||||
libsupc__convenience_la_SOURCES = $(sources)
|
||||
|
||||
# This insanely simple bit of install magic courtesy of Mr. Tromey.
|
||||
glibcppinstalldir= $(prefix)/include/g++-v3
|
||||
# Check for various configure bits that change where the headers get installed.
|
||||
if GXX_INCLUDE_DIR
|
||||
glibcppinstalldir = @gxx_include_dir@
|
||||
else
|
||||
if VERSION_SPECIFIC_LIBS
|
||||
glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||
else
|
||||
glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
|
||||
endif
|
||||
endif
|
||||
|
||||
glibcppinstall_HEADERS = $(headers)
|
||||
|
||||
# Flags to force separate libtool library to be static only.
|
||||
|
||||
@ -98,14 +98,19 @@ WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
libstdcxx_interface = @libstdcxx_interface@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
MAINT_CHARSET = latin1
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
|
||||
# Need this library to both be part of libstdc++.a, and installed
|
||||
# separately too.
|
||||
@ -148,9 +153,10 @@ sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception.cc new_
|
||||
|
||||
libsupc___la_SOURCES = $(sources)
|
||||
libsupc__convenience_la_SOURCES = $(sources)
|
||||
@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@
|
||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
|
||||
|
||||
# This insanely simple bit of install magic courtesy of Mr. Tromey.
|
||||
glibcppinstalldir = $(prefix)/include/g++-v3
|
||||
glibcppinstall_HEADERS = $(headers)
|
||||
|
||||
# Flags to force separate libtool library to be static only.
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
## USA.
|
||||
|
||||
## $Id: Makefile.am,v 1.39 2000/10/12 11:45:23 bkoz Exp $
|
||||
## $Id: Makefile.am,v 1.40 2000/10/12 12:02:10 bkoz Exp $
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 gnits
|
||||
MAINT_CHARSET = latin1
|
||||
@ -31,10 +31,15 @@ MAINT_CHARSET = latin1
|
||||
if USE_LIBDIR
|
||||
toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
||||
else
|
||||
if VERSION_SPECIFIC_LIBS
|
||||
gcc_version = @gcc_version@
|
||||
toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
||||
toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
||||
else
|
||||
toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
||||
@ -218,24 +223,33 @@ $(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
|
||||
echo "done" > $(top_builddir)/stamp-cshadow
|
||||
|
||||
|
||||
# We cannot use the default rules to install headers since we cannot
|
||||
# statically decide which headers to install. So we have our own special
|
||||
# installation routine here.
|
||||
myincludep = $(DESTDIR)$(includedir)/g++-v3/
|
||||
# Check for various configure bits that change where the headers get installed.
|
||||
if GXX_INCLUDE_DIR
|
||||
myincludep = @gxx_include_dir@
|
||||
else
|
||||
if VERSION_SPECIFIC_LIBS
|
||||
myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||
else
|
||||
myincludep = $(prefix)/include/g++-@libstdcxx_interface@
|
||||
endif
|
||||
endif
|
||||
|
||||
install: myinstallheaders
|
||||
# We have our own special, needlessly complicated installation routine
|
||||
# here, as automake/autoconf is currently brain-damaged when it comes
|
||||
# to installing sub-directories of headers.
|
||||
install-data-local: myinstallheaders
|
||||
|
||||
# NB: As libio_headers may be empty, need this to make sure bash doesn't
|
||||
# choke on an empty for... loop by using libio_headers_install
|
||||
myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
myinstallheaders: $(headers:%=$(myincludep)/%)
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
for i in $(std_headers); do \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep)";\
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
|
||||
done; \
|
||||
for i in $(build_headers); do \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \
|
||||
$(INSTALL_DATA) $$i $(myincludep)bits/; \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)/bits/"; \
|
||||
$(INSTALL_DATA) $$i $(myincludep)/bits/; \
|
||||
done; \
|
||||
libio_headers_install='$(libio_headers)'; \
|
||||
for i in $$libio_headers_install; do \
|
||||
@ -244,22 +258,13 @@ myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
done; \
|
||||
fi;
|
||||
|
||||
$(headers:%=$(myincludep)%): $(myincludep)%: %
|
||||
$(headers:%=$(myincludep)/%): $(myincludep)/%: %
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
$(mkinstalldirs) $(@D); \
|
||||
echo " $(INSTALL_DATA) $^ $@"; \
|
||||
$(INSTALL_DATA) $^ $@; \
|
||||
fi;
|
||||
|
||||
# All the (now removed) machinations with string instantiations messes up the
|
||||
# automake-generated TAGS rule. Make a simple one here.
|
||||
TAGS: $(build_headers) $(cpu_headers)
|
||||
etags -C $(top_srcdir)/bits/*.h $(top_srcdir)/bits/*.tcc \
|
||||
$(build_headers) $(libio_headers) \
|
||||
$(top_srcdir)/src/*.cc \
|
||||
$(top_builddir)/src/limitsMEMBERS.cc $(top_builddir)/src/c++io.cc \
|
||||
-o $(top_builddir)/TAGS
|
||||
|
||||
# We have to handle misc-inst.cc and locale-inst.cc in a special way
|
||||
# since we cannot instantiate all classes due to missing definitions
|
||||
# for things like vptrs, type_info bits, etc. when using
|
||||
|
||||
@ -98,14 +98,19 @@ WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
libstdcxx_interface = @libstdcxx_interface@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 gnits
|
||||
MAINT_CHARSET = latin1
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
||||
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
||||
|
||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
||||
@ -179,11 +184,9 @@ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
|
||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
|
||||
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = $(top_builddir)/stamp-cshadow
|
||||
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H =
|
||||
|
||||
# We cannot use the default rules to install headers since we cannot
|
||||
# statically decide which headers to install. So we have our own special
|
||||
# installation routine here.
|
||||
myincludep = $(DESTDIR)$(includedir)/g++-v3/
|
||||
@GXX_INCLUDE_DIR_TRUE@myincludep = @gxx_include_dir@
|
||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@
|
||||
|
||||
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
|
||||
# modified in a per-library or per-sub-library way.
|
||||
@ -350,6 +353,16 @@ ID: $(HEADERS) $(SOURCES) $(LISP)
|
||||
here=`pwd` && cd $(srcdir) \
|
||||
&& mkid -f$$here/ID $$unique $(LISP)
|
||||
|
||||
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
list='$(SOURCES) $(HEADERS)'; \
|
||||
unique=`for i in $$list; do echo $$i; done | \
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
clean-tags:
|
||||
@ -387,7 +400,7 @@ install-info: install-info-am
|
||||
install-exec-am: install-toolexeclibLTLIBRARIES
|
||||
install-exec: install-exec-am
|
||||
|
||||
install-data-am:
|
||||
install-data-am: install-data-local
|
||||
install-data: install-data-am
|
||||
|
||||
install-am: all-am
|
||||
@ -448,10 +461,11 @@ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
|
||||
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
|
||||
dvi-am dvi check check-am installcheck-am installcheck install-info-am \
|
||||
install-info install-exec-am install-exec install-data-am install-data \
|
||||
install-am install uninstall-am uninstall all-redirect all-am all \
|
||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
install-info install-exec-am install-exec install-data-local \
|
||||
install-data-am install-data install-am install uninstall-am uninstall \
|
||||
all-redirect all-am all installdirs mostlyclean-generic \
|
||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||
mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
# Specify that all *.o's depend on this.
|
||||
@ -464,19 +478,22 @@ $(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
|
||||
rm -f $(top_builddir)/stamp-cshadow
|
||||
echo "done" > $(top_builddir)/stamp-cshadow
|
||||
|
||||
install: myinstallheaders
|
||||
# We have our own special, needlessly complicated installation routine
|
||||
# here, as automake/autoconf is currently brain-damaged when it comes
|
||||
# to installing sub-directories of headers.
|
||||
install-data-local: myinstallheaders
|
||||
|
||||
# NB: As libio_headers may be empty, need this to make sure bash doesn't
|
||||
# choke on an empty for... loop by using libio_headers_install
|
||||
myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
myinstallheaders: $(headers:%=$(myincludep)/%)
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
for i in $(std_headers); do \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep)";\
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
|
||||
done; \
|
||||
for i in $(build_headers); do \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \
|
||||
$(INSTALL_DATA) $$i $(myincludep)bits/; \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)/bits/"; \
|
||||
$(INSTALL_DATA) $$i $(myincludep)/bits/; \
|
||||
done; \
|
||||
libio_headers_install='$(libio_headers)'; \
|
||||
for i in $$libio_headers_install; do \
|
||||
@ -485,22 +502,13 @@ myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
done; \
|
||||
fi;
|
||||
|
||||
$(headers:%=$(myincludep)%): $(myincludep)%: %
|
||||
$(headers:%=$(myincludep)/%): $(myincludep)/%: %
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
$(mkinstalldirs) $(@D); \
|
||||
echo " $(INSTALL_DATA) $^ $@"; \
|
||||
$(INSTALL_DATA) $^ $@; \
|
||||
fi;
|
||||
|
||||
# All the (now removed) machinations with string instantiations messes up the
|
||||
# automake-generated TAGS rule. Make a simple one here.
|
||||
TAGS: $(build_headers) $(cpu_headers)
|
||||
etags -C $(top_srcdir)/bits/*.h $(top_srcdir)/bits/*.tcc \
|
||||
$(build_headers) $(libio_headers) \
|
||||
$(top_srcdir)/src/*.cc \
|
||||
$(top_builddir)/src/limitsMEMBERS.cc $(top_builddir)/src/c++io.cc \
|
||||
-o $(top_builddir)/TAGS
|
||||
|
||||
# We have to handle misc-inst.cc and locale-inst.cc in a special way
|
||||
# since we cannot instantiate all classes due to missing definitions
|
||||
# for things like vptrs, type_info bits, etc. when using
|
||||
|
||||
Loading…
Reference in New Issue
Block a user