2002-12-10 Nathanael Nerode <neroden@gcc.gnu.org>

* Makefile.tpl: Substitute more autoconfily.
	* configure: Substitute more autoconfily.
	* Makefile.in: Regenerate.
This commit is contained in:
Nathanael Nerode 2002-12-11 04:00:09 +00:00
parent 85a6d8d39b
commit d03be79e9b
4 changed files with 21 additions and 41 deletions

View file

@ -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 * Makefile.tpl: Substitute more autoconfily.
targets depend on phony targets. * 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> 2002-12-06 DJ Delorie <dj@redhat.com>

View file

@ -109,7 +109,7 @@ INSTALL_DATA = $(INSTALL) -m 644
AS = @AS@ AS = @AS@
AR = @AR@ AR = @AR@
AR_FLAGS = rc AR_FLAGS = rc
CC = cc CC = @CC@
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined # Special variables passed down in EXTRA_GCC_FLAGS. They are defined
# here so that they can be overridden by Makefile fragments. # 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 = @BUILD_PREFIX@
BUILD_PREFIX_1 = @BUILD_PREFIX_1@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
# These flag values are normally overridden by the configure script. CFLAGS = @CFLAGS@
CFLAGS = -g CXXFLAGS = @CXXFLAGS@
CXXFLAGS = -g -O2
LDFLAGS = LDFLAGS =
LIBCFLAGS = $(CFLAGS) LIBCFLAGS = $(CFLAGS)
@ -134,7 +133,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
PICFLAG = PICFLAG =
PICFLAG_FOR_TARGET = PICFLAG_FOR_TARGET =
CXX = c++ CXX = @CXX@
# Use -O2 to stress test the compiler. # Use -O2 to stress test the compiler.
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates

View file

@ -112,7 +112,7 @@ INSTALL_DATA = $(INSTALL) -m 644
AS = @AS@ AS = @AS@
AR = @AR@ AR = @AR@
AR_FLAGS = rc AR_FLAGS = rc
CC = cc CC = @CC@
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined # Special variables passed down in EXTRA_GCC_FLAGS. They are defined
# here so that they can be overridden by Makefile fragments. # 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 = @BUILD_PREFIX@
BUILD_PREFIX_1 = @BUILD_PREFIX_1@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
# These flag values are normally overridden by the configure script. CFLAGS = @CFLAGS@
CFLAGS = -g CXXFLAGS = @CXXFLAGS@
CXXFLAGS = -g -O2
LDFLAGS = LDFLAGS =
LIBCFLAGS = $(CFLAGS) LIBCFLAGS = $(CFLAGS)
@ -137,7 +136,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
PICFLAG = PICFLAG =
PICFLAG_FOR_TARGET = PICFLAG_FOR_TARGET =
CXX = c++ CXX = @CXX@
# Use -O2 to stress test the compiler. # Use -O2 to stress test the compiler.
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates

32
configure vendored
View file

@ -1279,34 +1279,10 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then
-e "s|@oldincludedir@|${oldincludedir}|" \ -e "s|@oldincludedir@|${oldincludedir}|" \
-e "s|@infodir@|${infodir}|" \ -e "s|@infodir@|${infodir}|" \
-e "s|@mandir@|${mandir}|" \ -e "s|@mandir@|${mandir}|" \
-e "/^CC[ ]*=/{ -e "s|@CC@|${CC}|" \
:loop1 -e "s|@CXX@|${CXX}|" \
/\\\\$/ N -e "s|@CC@|${CFLAGS}|" \
s/\\\\\\n//g -e "s|@CXXFLAGS@|${CXXFLAGS}|" \
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|@config_shell@|${config_shell}|" \ -e "s|@config_shell@|${config_shell}|" \
-e "s|@srcdir@|${srcdir}|" \ -e "s|@srcdir@|${srcdir}|" \
-e "s/ //" \ -e "s/ //" \