JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2002-09-25 Nathanael Nerode <neroden@gcc.gnu.org>

Browse Source 
* Makefile.tpl: Rewrite substituted lines to look autoconfy.
	* Makefile.in: Regenerate.
	* configure.in: Rewrite sed statements to look autoconfy.
This commit is contained in:
Nathanael Nerode 2002-09-25 17:25:27 +00:00
parent 862fb4455b
commit 426ce14a22
4 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,9 @@
2002-09-25 Nathanael Nerode <neroden@gcc.gnu.org> 2002-09-25 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Rewrite substituted lines to look autoconfy.
* Makefile.in: Regenerate.
* configure.in: Rewrite sed statements to look autoconfy.
* Makefile.tpl: Autogenerate *-target-* lists, dependencies of * Makefile.tpl: Autogenerate *-target-* lists, dependencies of
all-target-foo on configure-target-foo. all-target-foo on configure-target-foo.
* Makefile.def: Ditto. * Makefile.def: Ditto.

22
Makefile.in
View File

@ -43,7 +43,7 @@ includedir=${prefix}/include
oldincludedir=/usr/include oldincludedir=/usr/include
infodir=${prefix}/info infodir=${prefix}/info
mandir=${prefix}/man mandir=${prefix}/man
gxx_include_dir=${includedir}/g++ gxx_include_dir=@gxx_include_dir@
tooldir = $(exec_prefix)/$(target_alias) tooldir = $(exec_prefix)/$(target_alias)
build_tooldir = $(exec_prefix)/$(target_alias) build_tooldir = $(exec_prefix)/$(target_alias)
@ -188,22 +188,22 @@ OTHERS =
# This is set by the configure script to the list of directories which # This is set by the configure script to the list of directories which
# should be built using the target tools. # should be built using the target tools.
TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib winsup opcodes libf2c libobjc TARGET_CONFIGDIRS = @target_configdirs@
# Target libraries are put under this directory: # Target libraries are put under this directory:
# Changed by configure to $(target_alias) if cross. # Changed by configure to $(target_alias) if cross.
TARGET_SUBDIR = . TARGET_SUBDIR = @target_subdir@
BUILD_CONFIGDIRS = libiberty BUILD_CONFIGDIRS = libiberty
BUILD_SUBDIR = . BUILD_SUBDIR = @build_subdir@
# This is set by the configure script to the arguments to use when configuring # This is set by the configure script to the arguments to use when configuring
# directories built for the target. # directories built for the target.
TARGET_CONFIGARGS = TARGET_CONFIGARGS = @target_configargs@
# This is set by the configure script to the arguments to use when configuring # This is set by the configure script to the arguments to use when configuring
# directories built for the build system. # directories built for the build system.
BUILD_CONFIGARGS = BUILD_CONFIGARGS = @build_configargs@
# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared # This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
# was used. # was used.
@ -243,11 +243,11 @@ INSTALL_TARGET_CROSS = installdirs \
$(INSTALL_DOSREL) $(INSTALL_DOSREL)
# Should be substed by configure.in # Should be substed by configure.in
FLAGS_FOR_TARGET = FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
CC_FOR_TARGET = CC_FOR_TARGET = @CC_FOR_TARGET@
CXX_FOR_TARGET = CXX_FOR_TARGET = @CXX_FOR_TARGET@
CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
GCJ_FOR_TARGET = GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
# If GCC_FOR_TARGET is not overriden on the command line, then this # If GCC_FOR_TARGET is not overriden on the command line, then this
# variable is passed down to the gcc Makefile, where it is used to # variable is passed down to the gcc Makefile, where it is used to

22
Makefile.tpl
View File

@ -46,7 +46,7 @@ includedir=${prefix}/include
oldincludedir=/usr/include oldincludedir=/usr/include
infodir=${prefix}/info infodir=${prefix}/info
mandir=${prefix}/man mandir=${prefix}/man
gxx_include_dir=${includedir}/g++ gxx_include_dir=@gxx_include_dir@
tooldir = $(exec_prefix)/$(target_alias) tooldir = $(exec_prefix)/$(target_alias)
build_tooldir = $(exec_prefix)/$(target_alias) build_tooldir = $(exec_prefix)/$(target_alias)
@ -191,22 +191,22 @@ OTHERS =
# This is set by the configure script to the list of directories which # This is set by the configure script to the list of directories which
# should be built using the target tools. # should be built using the target tools.
TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib winsup opcodes libf2c libobjc TARGET_CONFIGDIRS = @target_configdirs@
# Target libraries are put under this directory: # Target libraries are put under this directory:
# Changed by configure to $(target_alias) if cross. # Changed by configure to $(target_alias) if cross.
TARGET_SUBDIR = . TARGET_SUBDIR = @target_subdir@
BUILD_CONFIGDIRS = libiberty BUILD_CONFIGDIRS = libiberty
BUILD_SUBDIR = . BUILD_SUBDIR = @build_subdir@
# This is set by the configure script to the arguments to use when configuring # This is set by the configure script to the arguments to use when configuring
# directories built for the target. # directories built for the target.
TARGET_CONFIGARGS = TARGET_CONFIGARGS = @target_configargs@
# This is set by the configure script to the arguments to use when configuring # This is set by the configure script to the arguments to use when configuring
# directories built for the build system. # directories built for the build system.
BUILD_CONFIGARGS = BUILD_CONFIGARGS = @build_configargs@
# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared # This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
# was used. # was used.
@ -246,11 +246,11 @@ INSTALL_TARGET_CROSS = installdirs \
$(INSTALL_DOSREL) $(INSTALL_DOSREL)
# Should be substed by configure.in # Should be substed by configure.in
FLAGS_FOR_TARGET = FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
CC_FOR_TARGET = CC_FOR_TARGET = @CC_FOR_TARGET@
CXX_FOR_TARGET = CXX_FOR_TARGET = @CXX_FOR_TARGET@
CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
GCJ_FOR_TARGET = GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
# If GCC_FOR_TARGET is not overriden on the command line, then this # If GCC_FOR_TARGET is not overriden on the command line, then this
# variable is passed down to the gcc Makefile, where it is used to # variable is passed down to the gcc Makefile, where it is used to

22
configure.in
View File

@ -1542,17 +1542,17 @@ qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
sedtemp=sed.$$ sedtemp=sed.$$
cat >$sedtemp <<EOF cat >$sedtemp <<EOF
s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}: s:@target_configdirs@:${target_configdirs}:
s%^TARGET_CONFIGARGS[ ]*=.*$%TARGET_CONFIGARGS = ${targargs}% s%@target_configargs@%${targargs}%
s%^FLAGS_FOR_TARGET[ ]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}% s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}%
s%^CC_FOR_TARGET[ ]*=.*$%CC_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}% s%@CC_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}%
s%^GCJ_FOR_TARGET[ ]*=.*$%GCJ_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}% s%@GCJ_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}%
s%^CXX_FOR_TARGET[ ]*=.*$%CXX_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}% s%@CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}%
s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ ]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = \$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}% s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}%
s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}% s%@target_subdir@%${target_subdir}%
s%^BUILD_SUBDIR[ ]*=.*$%BUILD_SUBDIR = ${build_subdir}% s%@build_subdir@%${build_subdir}%
s%^BUILD_CONFIGARGS[ ]*=.*$%BUILD_CONFIGARGS = ${buildargs}% s%@build_configargs@%${buildargs}%
s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}% s%@gxx_include_dir@%${gxx_include_dir}%
EOF EOF
sed -f $sedtemp Makefile > Makefile.tem sed -f $sedtemp Makefile > Makefile.tem
rm -f Makefile $sedtemp rm -f Makefile $sedtemp