diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | Makefile.tpl | 9 | ||||
| -rwxr-xr-x | configure | 32 |
4 files changed, 21 insertions, 41 deletions
@@ -1,7 +1,13 @@ -2002-12-06 DJ Delorie <dj@redhat.com> +2002-12-10 Nathanael Nerode <neroden@gcc.gnu.org> - * Makefile.tpl: Change configure dependencies to not have real - targets depend on phony targets. + * Makefile.tpl: Substitute more autoconfily. + * configure: Substitute more autoconfily. + * Makefile.in: Regenerate. + +2002-12-08 Andrew Cagney <ac131313@redhat.com> + + * Makefile.tpl (all-sim): Depend on maybe-configure-gdb. + * Makefile.in (all-sim): Ditto. 2002-12-06 DJ Delorie <dj@redhat.com> diff --git a/Makefile.in b/Makefile.in index 81b4e4e..47e5192 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,7 +109,7 @@ INSTALL_DATA = $(INSTALL) -m 644 AS = @AS@ AR = @AR@ AR_FLAGS = rc -CC = cc +CC = @CC@ # Special variables passed down in EXTRA_GCC_FLAGS. They are defined # here so that they can be overridden by Makefile fragments. @@ -117,9 +117,8 @@ BUILD_CC = $(CC_FOR_BUILD) BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ -# These flag values are normally overridden by the configure script. -CFLAGS = -g -CXXFLAGS = -g -O2 +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ LDFLAGS = LIBCFLAGS = $(CFLAGS) @@ -134,7 +133,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) PICFLAG = PICFLAG_FOR_TARGET = -CXX = c++ +CXX = @CXX@ # Use -O2 to stress test the compiler. LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates diff --git a/Makefile.tpl b/Makefile.tpl index 8a9284e..3de524c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -112,7 +112,7 @@ INSTALL_DATA = $(INSTALL) -m 644 AS = @AS@ AR = @AR@ AR_FLAGS = rc -CC = cc +CC = @CC@ # Special variables passed down in EXTRA_GCC_FLAGS. They are defined # here so that they can be overridden by Makefile fragments. @@ -120,9 +120,8 @@ BUILD_CC = $(CC_FOR_BUILD) BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ -# These flag values are normally overridden by the configure script. -CFLAGS = -g -CXXFLAGS = -g -O2 +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ LDFLAGS = LIBCFLAGS = $(CFLAGS) @@ -137,7 +136,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) PICFLAG = PICFLAG_FOR_TARGET = -CXX = c++ +CXX = @CXX@ # Use -O2 to stress test the compiler. LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -1279,34 +1279,10 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then -e "s|@oldincludedir@|${oldincludedir}|" \ -e "s|@infodir@|${infodir}|" \ -e "s|@mandir@|${mandir}|" \ - -e "/^CC[ ]*=/{ - :loop1 - /\\\\$/ N - s/\\\\\\n//g - t loop1 - s%^CC[ ]*=.*$%CC = ${CC}% - }" \ - -e "/^CXX[ ]*=/{ - :loop2 - /\\\\$/ N - s/\\\\\\n//g - t loop2 - s%^CXX[ ]*=.*$%CXX = ${CXX}% - }" \ - -e "/^CFLAGS[ ]*=/{ - :loop3 - /\\\\$/ N - s/\\\\\\n//g - t loop3 - s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% - }" \ - -e "/^CXXFLAGS[ ]*=/{ - :loop4 - /\\\\$/ N - s/\\\\\\n//g - t loop4 - s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% - }" \ + -e "s|@CC@|${CC}|" \ + -e "s|@CXX@|${CXX}|" \ + -e "s|@CC@|${CFLAGS}|" \ + -e "s|@CXXFLAGS@|${CXXFLAGS}|" \ -e "s|@config_shell@|${config_shell}|" \ -e "s|@srcdir@|${srcdir}|" \ -e "s/ //" \ |