GCC Makefile.in cleanup 2/n

GCC Makefile.in cleanup 2/n

[Nathanael Nerode]

Since 'all' is defined at the top of the file, all.indirect is 
unnecessary.  I pulled $(ALL) up to be with all:.  I pulled .SUFFIXES 
up into the 'generic setup' section at the top.

	* Makefile.in: Eliminate all.indirect.  Rearrange.

--- Makefile.in.old	2003-03-06 21:11:39.000000000 -0500
+++ Makefile.in	2003-03-06 21:21:02.000000000 -0500
@@ -25,7 +25,11 @@
 # stage1, stage2, stage3, stage4.
 
 # This is the default target.
-all:
+all: $(ALL)
+
+# Set by autoconf to "all.internal" for a native build, or
+# "all.cross" to build a cross compiler.
+ALL = @ALL@
 
 # Suppress smart makes who think they know how to automake Yacc files
 .y.c:
@@ -34,6 +38,14 @@
 # defined in this file into the environment.
 .NOEXPORT:
 
+# The only suffixes we want for implicit rules are .c and .o, so clear
+# the list and add them.  This speeds up GNU Make, and allows -r to work.
+# For i18n support, we also need .gmo, .po, .pox.
+# This must come before the language makefile fragments to allow them to
+# add suffixes and rules of their own.
+.SUFFIXES:
+.SUFFIXES: .c .o .po .pox .gmo
+
 # -------------------------------
 # Standard autoconf-set variables
 # -------------------------------
@@ -563,10 +575,6 @@
 PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'`
 UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'`
 
-# Set by autoconf to "all.internal" for a native build, or
-# "all.cross" to build a cross compiler.
-ALL = @ALL@
-
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
             echo $${rootme}/../expect/expect ; \
@@ -603,12 +611,6 @@
 
 # End of variables for you to override.
 
-# Definition of `all' is here so that new rules inserted by sed
-# do not specify the default target.
-# The real definition is under `all.internal' (for native compilers)
-# or `all.cross' (for cross compilers).
-all: all.indirect
-
 # GTM_H lists the config files that the generator files depend on,
 # while TM_H lists the ones ordinary gcc files depend on, which
 # includes several files generated by those generators.
@@ -657,8 +659,6 @@
 #\f
 # Now figure out from those variables how to compile and link.
 
-all.indirect: $(ALL)
-
 # IN_GCC distinguishes between code compiled into GCC itself and other
 # programs built during a bootstrap.
 # autoconf inserts -DCROSS_COMPILE if we are building a cross compiler.
@@ -867,14 +867,6 @@
 # unwinder info.
 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
 
-# The only suffixes we want for implicit rules are .c and .o, so clear
-# the list and add them.  This speeds up GNU Make, and allows -r to work.
-# For i18n support, we also need .gmo, .po, .pox.
-# This must come before the language makefile fragments to allow them to
-# add suffixes and rules of their own.
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo
-
 #\f
 # Language makefile fragments.
 

Re: GCC Makefile.in cleanup 2/n

[Zack Weinberg]

Nathanael Nerode <neroden@twcny.rr.com> writes:

> Since 'all' is defined at the top of the file, all.indirect is 
> unnecessary.  I pulled $(ALL) up to be with all:.  I pulled .SUFFIXES 
> up into the 'generic setup' section at the top.

It seems silly to have $(ALL) -- why not just 

 # This is the default target.
 # Set by autoconf to "all.internal" for a native build, or
 # "all.cross" to build a cross compiler.
 all: @ALL@

zw

Re: GCC Makefile.in cleanup 2/n

[Alexandre Oliva]

On Mar  6, 2003, Nathanael Nerode <neroden@twcny.rr.com> wrote:

> Since 'all' is defined at the top of the file, all.indirect is 
> unnecessary.  I pulled $(ALL) up to be with all:.

I'd feel a bit more comfortable if you moved the definition of ALL
before the use as well.  We currently require POSIX-compliant makes,
so they would probably not fail on this, but I have a vague
recollection of having run into some breakage due to ordering of macro
definition and use in dependency lists.  Ok otherwise.

> 	* Makefile.in: Eliminate all.indirect.  Rearrange.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Re: GCC Makefile.in cleanup 2/n

[Alexandre Oliva]

On Mar  6, 2003, Nathanael Nerode <neroden@twcny.rr.com> wrote:

> Well, it was conceivable that someone found it useful to override ALL 
> at make time.  So I thought, why break that?

Agreed.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Re: GCC Makefile.in cleanup 2/n

[Nathanael Nerode]

Nathanael Nerode <neroden at twcny dot rr dot com> writes:

> Since 'all' is defined at the top of the file, all.indirect is 
> unnecessary.  I pulled $(ALL) up to be with all:.  I pulled .SUFFIXES 
> up into the 'generic setup' section at the top.

Zack wrote:
>It seems silly to have $(ALL) -- why not just 
>
> # This is the default target.
> # Set by autoconf to "all.internal" for a native build, or
> # "all.cross" to build a cross compiler.
> all: @ALL@
>
>zw

Well, it was conceivable that someone found it useful to override ALL 
at make time.  So I thought, why break that?

I'll be happy to do as you suggest if consensus is that it's a good 
idea.

--Nathanael