This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GCC Makefile.in cleanup 4/n


Pretty much what the Changelog entry says.  I welcome nitpicking, since it's
a bunch of small unrelated changes.  I deleted a lot of the 
"This is overridden by configure." lines since that's quite adequately
described by the @foo@ notation.

Designed to apply after the following unreviewed patches:

#1 http://gcc.gnu.org/ml/gcc-patches/2003-03/msg00592.html
#1 http://gcc.gnu.org/ml/gcc-patches/2003-03/msg00593.html
#3 http://gcc.gnu.org/ml/gcc-patches/2003-03/msg00598.html

This also incorporates Zack's suggestion in
http://gcc.gnu.org/ml/gcc-patches/2003-03/msg00596.html.

If it's prefered, I can submit an omnibus patch.

This is merely the beginning stage of a slow cleanup process, but I'm already
beginning to be able to follow the Makefile better.

	* Makefile.in: Update and clean up comments.  Rearrange slightly.

--- Makefile.in.old	2003-03-12 13:09:33.000000000 -0500
+++ Makefile.in	2003-03-12 13:23:55.000000000 -0500
@@ -1,6 +1,8 @@
-# Makefile for GNU C compiler.
-#   Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
-#   1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Makefile for GNU Compiler Collection
+# Run 'configure' to generate Makefile from Makefile.in
+
+# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+# 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -25,21 +27,23 @@
 # stage1, stage2, stage3, stage4.
 
 # This is the default target.
-all: $(ALL)
-
 # Set by autoconf to "all.internal" for a native build, or
 # "all.cross" to build a cross compiler.
-ALL = @ALL@
+all: @ALL@
 
-# Suppress smart makes who think they know how to automake Yacc files
-.y.c:
+# Depend on this to specify a phony target portably.
+force:
 
-# This tells GNU make version 3 not to export all the variables
-# defined in this file into the environment.
+# This tells GNU make version 3 not to export the variables
+# defined in this file into the environment (and thus recursive makes).
 .NOEXPORT:
-# For GNUmake: let us decide what gets passed to recursive makes.
+# And this tells it not to automatically pass command-line variables
+# to recursive makes.
 MAKEOVERRIDES =
 
+# Suppress smart makes who think they know how to automake Yacc files
+.y.c:
+
 # 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.
@@ -60,7 +64,7 @@
 target= at target@
 target_alias= at target_alias@
 
-# Sed command to transform gcc to installed name.  Overwritten by configure.
+# Sed command to transform gcc to installed name.
 program_transform_name = @program_transform_name@
 program_transform_cross_name = s,^,$(target_alias)-,
 
@@ -78,6 +82,8 @@
 parsedir = $(srcdir)
 docobjdir = $(srcdir)/doc
 
+# Top build directory, relative to here.
+top_builddir = .
 # objdir is set by configure.
 # It's normally the absolute path to the current directory.
 objdir = @objdir@
@@ -90,16 +96,13 @@
 # See below for how to change them for certain systems.
 
 # List of language subdirectories.
-# This is overridden by configure.
 SUBDIRS = at subdirs@
 
 # Selection of languages to be made.
-# This is overridden by configure.
 CONFIG_LANGUAGES = @all_languages@
 LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES)
 
 # Selection of languages to be made during stage1 build.
-# This is overridden by configure.
 BOOT_LANGUAGES = c @all_boot_languages@
 
 # Various ways of specifying flags for compilations:
@@ -217,6 +220,7 @@
 # in the kernel.  So, we use `echo' instead.
 STAMP = echo timestamp >
 
+# Make sure the $(MAKE) variable is defined.
 @SET_MAKE@
 
 # --------
@@ -261,12 +265,6 @@
 # It also specifies -isystem ./include to find, e.g., stddef.h.
 GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -isystem ./include $(TCFLAGS)
 
-# Tools to use when building a cross-compiler.
-# These are used because `configure' appends `cross-make'
-# to the makefile when making a cross-compiler.
-
-# Use the tools from the build tree, if they are available.
-
 # ---------------------------------------------------
 # Programs which produce files for the target machine
 # ---------------------------------------------------
@@ -430,9 +428,6 @@
 # Dir for temp files.
 tmpdir = /tmp
 
-# Top build directory, relative to here.
-top_builddir = .
-
 # Whether we were configured with NLS.
 USE_NLS = @USE_NLS@
 
@@ -503,7 +498,6 @@
 EXTRA_GCC_OBJS = at host_extra_gcc_objs@
 
 # List of additional header files to install.
-# Often this is edited directly by `configure'.
 EXTRA_HEADERS = at extra_headers_list@
 
 # It is convenient for configure to add the assignment at the beginning,
@@ -539,7 +533,6 @@
 OTHER_FIXINCLUDES_DIRS=
 
 # A list of all the language-specific executables.
-# This is overridden by configure.
 COMPILERS = cc1$(exeext) @all_compilers@
 
 # List of things which should already be built whenever we try to use xgcc
@@ -729,10 +722,9 @@
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 #
-# Support for additional languages (other than c and objc).
-# ??? objc can be supported this way too (leave for later).
+# Support for additional languages (other than C).
+# C can be supported this way too (leave for later).
 
-# These next lines are overridden by configure.
 LANG_MAKEFILES = @all_lang_makefiles@
 LANG_STAGESTUFF = @all_stagestuff@
 
@@ -3801,8 +3793,6 @@
 .PHONY: stage1 stage2 stage3 stage4 clean maintainer-clean TAGS bootstrap
 .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4
 
-force:
-
 # Rules for generating translated message descriptions.
 # Disabled by autoconf if the tools are not available.
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]