toplevel, more cleanup
Nathanael Nerode
neroden@doctormoo.dyndns.org
Sat Sep 28 17:40:00 GMT 2002
Clean up substitution of SUBDIRS to be more autoconf-like. Tested, no
changes. Drop useless make variable OTHERS.
2002-09-22 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Make more autoconf-friendly.
* Makefile.in: Regenerate.
* configure: Make substitution more autoconf-like.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.116
diff -u -3 -r1.116 Makefile.in
--- Makefile.in 26 Sep 2002 04:14:02 -0000 1.116
+++ Makefile.in 28 Sep 2002 16:56:29 -0000
@@ -181,8 +181,7 @@
CC_FOR_BUILD = $(CC)
CXX_FOR_BUILD = $(CXX)
-SUBDIRS = "this is set via configure, don't edit this"
-OTHERS =
+SUBDIRS = @configdirs@
# This is set by the configure script to the list of directories which
# should be built using the target tools.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.4
diff -u -3 -r1.4 Makefile.tpl
--- Makefile.tpl 26 Sep 2002 04:14:02 -0000 1.4
+++ Makefile.tpl 28 Sep 2002 16:56:31 -0000
@@ -184,8 +184,7 @@
CC_FOR_BUILD = $(CC)
CXX_FOR_BUILD = $(CXX)
-SUBDIRS = "this is set via configure, don't edit this"
-OTHERS =
+SUBDIRS = @configdirs@
# This is set by the configure script to the list of directories which
# should be built using the target tools.
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/configure,v
retrieving revision 1.47
diff -u -3 -r1.47 configure
--- configure 26 Sep 2002 04:14:02 -0000 1.47
+++ configure 28 Sep 2002 16:56:32 -0000
@@ -1356,8 +1356,7 @@
rm -f ${subdir}/Makefile.tm2
sedtemp=sed.$$
cat >$sedtemp <<EOF
-s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:
-s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:
+s:@configdirs@:${configdirs}:
EOF
sed -f $sedtemp \
${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
More information about the Binutils
mailing list