diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-10-12 12:02:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-10-12 12:02:10 +0000 |
| commit | b1e53318603f977aafab9404a22f8195c4f0ad96 (patch) | |
| tree | 1c10caabb31cc1c773f5cea905dde0fe5a488a63 | |
| parent | e466dc8a4ab0761107e2d7513471985256c2605e (diff) | |
| download | gcc-b1e53318603f977aafab9404a22f8195c4f0ad96.zip gcc-b1e53318603f977aafab9404a22f8195c4f0ad96.tar.gz gcc-b1e53318603f977aafab9404a22f8195c4f0ad96.tar.bz2 | |
Makefile.am: Use it.
2000-10-11 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* libsupc++/Makefile.am: Use it.
* libio/Makefile.am: Use it.
* libmath/Makefile.am: Use it.
* src/Makefile.am: Use it.
* Makefile.am (AM_MAKEFLAGS): Remove includes.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
* configure.in: Use it.
* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.
* src/Makefile.am (CXXCOMPILE): Remove.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am (CXXCOMPILE): Same here.
From-SVN: r36848
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 3 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 4 |
5 files changed, 9 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 460b5da..f6ac9b6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -11,7 +11,12 @@ * configure.in: Use it. * mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR. - + + * src/Makefile.am (CXXCOMPILE): Remove. + * src/Makefile.in: Regenerate. + * libsupc++/Makefile.am (CXXCOMPILE): Same here. + * libsupc++/Makefile.in: Regenerate. + 2000-10-11 Phil Edwards <pme@sources.redhat.com> * acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Comment out diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index d9dc106..0d43cf7 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -117,9 +117,6 @@ AM_CXXFLAGS = \ # an include diretory, which screws up shadow headers. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) $(AM_CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index f44c544..b616473 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -170,9 +170,6 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) # an include diretory, which screws up shadow headers. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) - - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) @@ -202,6 +199,7 @@ libsupc___la_OBJECTS = del_op.lo del_opnt.lo del_opv.lo del_opvnt.lo \ exception.lo new_handler.lo new_op.lo new_opnt.lo new_opv.lo \ new_opvnt.lo pure.lo tinfo.lo tinfo2.lo vec.lo CXXFLAGS = @CXXFLAGS@ +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) HEADERS = $(glibcppinstall_HEADERS) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index ff20897..a9869de 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.38 2000/10/10 23:50:39 bkoz Exp $ +## $Id: Makefile.am,v 1.39 2000/10/12 11:45:23 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -310,9 +310,6 @@ AM_CXXFLAGS = \ # an include diretory, which screws up shadow headers. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) $(AM_CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 7495476..7a7224e 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -198,9 +198,6 @@ AM_CXXFLAGS = -fno-implicit-templates $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) # an include diretory, which screws up shadow headers. (That way, # things like -O2 passed down from the toplevel can be overridden by # --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) - - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) @@ -231,6 +228,7 @@ complexl.lo complex_io.lo stdexcept.lo c++io.lo ios.lo stdstreams.lo \ strstream.lo locale.lo localename.lo codecvt.lo locale-inst.lo \ stl-inst.lo misc-inst.lo valarray-inst.lo string-inst.lo CXXFLAGS = @CXXFLAGS@ +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |