From c31da8a53569c3e93ed09672f832850785038ff7 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 17 Mar 2003 11:02:39 +0000 Subject: [PATCH] Makefile.am (C_COMPILE): Remove. * libsupc++/Makefile.am (C_COMPILE): Remove. (LTCOMPILE): Likewise. * libsupc++/Makefile.in: Regenerate. From-SVN: r64477 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libsupc++/Makefile.am | 12 ------------ libstdc++-v3/libsupc++/Makefile.in | 14 ++------------ 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 62ce3f7..0885ee0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-03-17 Danny Smith + + * libsupc++/Makefile.am (C_COMPILE): Remove. + (LTCOMPILE): Likewise. + * libsupc++/Makefile.in: Regenerate. + 2003-03-14 Benjamin Kosnik * testsuite/23_containers/bitset_members.cc: Add test variable. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 8367ba8..4fa9b94 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -102,18 +102,6 @@ libsupc__convenience_la_SOURCES = $(sources) glibcppinstalldir = $(gxx_include_dir) glibcppinstall_HEADERS = $(headers) -# Use special rules for pulling things out of libiberty. These -# objects should be compiled with the "C" compiler, not the C++ -# compiler, and also should not use the C++ includes. -C_COMPILE = \ - $(CC) $(DEFS) $(GCC_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -# LTCOMPILE is copied from LTCXXCOMPILE below. -LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \ - $(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) \ - $(AM_CPPFLAGS) $(CPPFLAGS) - # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually # set this option because CONFIG_CXXFLAGS has to be after diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 9296456..98395c4 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -193,16 +193,6 @@ libsupc__convenience_la_SOURCES = $(sources) glibcppinstalldir = $(gxx_include_dir) glibcppinstall_HEADERS = $(headers) -# Use special rules for pulling things out of libiberty. These -# objects should be compiled with the "C" compiler, not the C++ -# compiler, and also should not use the C++ includes. -C_COMPILE = $(CC) $(DEFS) $(GCC_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - - -# LTCOMPILE is copied from LTCXXCOMPILE below. -LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) $(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) - - # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually # set this option because CONFIG_CXXFLAGS has to be after -- 2.7.4