diff options
| author | Phil Edwards <pme@gcc.gnu.org> | 2003-08-17 20:23:12 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2003-08-17 20:23:12 +0000 |
| commit | 0df3f383efc37b6b0d231f38b713d3aa7beef609 (patch) | |
| tree | bc40445978d8406152440975e0c56f5763886180 /libstdc++-v3/libmath | |
| parent | dd61aa98caa43a54970c2a4eecf9c4e3f325d14e (diff) | |
| download | gcc-0df3f383efc37b6b0d231f38b713d3aa7beef609.zip gcc-0df3f383efc37b6b0d231f38b713d3aa7beef609.tar.gz gcc-0df3f383efc37b6b0d231f38b713d3aa7beef609.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3/libmath')
| -rw-r--r-- | libstdc++-v3/libmath/Makefile.am | 10 | ||||
| -rw-r--r-- | libstdc++-v3/libmath/Makefile.in | 15 |
2 files changed, 5 insertions, 20 deletions
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am index aef3771..9d41477 100644 --- a/libstdc++-v3/libmath/Makefile.am +++ b/libstdc++-v3/libmath/Makefile.am @@ -1,6 +1,6 @@ ## 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. ## ## This file is part of the libstdc++ version 3 distribution. @@ -26,17 +26,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs noinst_LTLIBRARIES = libmath.la -libmath_la_LIBADD = @LIBMATHOBJS@ +libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_SOURCES = stubs.c -# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES -TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ - -INCLUDES = \ - $(TOPLEVEL_INCLUDES) +AM_CPPFLAGS = $(CANADIAN_INCLUDES) # Only compiling "C" sources in this directory. LIBTOOL = @LIBTOOL@ --tag CC diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 56c9c7b..18d3ac4 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASIC_FILE_CC = @BASIC_FILE_CC@ BASIC_FILE_H = @BASIC_FILE_H@ -CANADIAN_FALSE = @CANADIAN_FALSE@ -CANADIAN_TRUE = @CANADIAN_TRUE@ CC = @CC@ CCODECVT_CC = @CCODECVT_CC@ CCODECVT_H = @CCODECVT_H@ @@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@ FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@ GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@ 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_TRUE = @GLIBCXX_BUILD_PCH_TRUE@ GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@ @@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ LIBMATHOBJS = @LIBMATHOBJS@ -LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ # Only compiling "C" sources in this directory. @@ -142,8 +135,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ SYMVER_MAP = @SYMVER_MAP@ - -# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -211,15 +202,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs noinst_LTLIBRARIES = libmath.la -libmath_la_LIBADD = @LIBMATHOBJS@ +libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_SOURCES = stubs.c -INCLUDES = \ - $(TOPLEVEL_INCLUDES) - +AM_CPPFLAGS = $(CANADIAN_INCLUDES) subdir = libmath ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADER = $(top_builddir)/config.h |