Consistently include Makeconfig after defining subdir.

In <https://sourceware.org/ml/libc-alpha/2014-01/msg00196.html> I
noted it was necessary to add includes of Makeconfig early in various
subdirectory makefiles for the tests-special variable settings added
by that patch to be conditional on configuration information.  No-one
commented on the general question there of whether Makeconfig should
always be included immediately after the definition of subdir.

This patch implements that early inclusion of Makeconfig in each
directory (which is a lot easier than consistent placement of includes
of Rules).  Includes are added if needed, or moved up if already
present.  Subdirectory "all:" targets are removed, since Makeconfig
provides one.

There is potential for further cleanups I haven't done.  Rules and
Makerules have code such as

ifneq   "$(findstring env,$(origin headers))" ""
headers :=
endif

to override to empty any value of various variables that came from the
environment.  I think there is a case for Makeconfig setting all the
subdirectory variables (other than subdir) to empty to ensure no
outside value is going to take effect if a subdirectory fails to
define a variable.  (A list of such variables, possibly out of date
and incomplete, is in manual/maint.texi.)  Rules and Makerules would
give errors if Makeconfig hadn't already been included, instead of
including it themselves.  The special code to override values coming
from the environment would then be obsolete and could be removed.

Tested x86_64, including that installed binaries are identical before
and after the patch.

	* argp/Makefile: Include Makeconfig immediately after defining
	subdir.
	* assert/Makefile: Likewise.
	* benchtests/Makefile: Likewise.
	* catgets/Makefile: Likewise.
	* conform/Makefile: Likewise.
	* crypt/Makefile: Likewise.
	* csu/Makefile: Likewise.
	(all): Remove target.
	* ctype/Makefile: Include Makeconfig immediately after defining
	subdir.
	* debug/Makefile: Likewise.
	* dirent/Makefile: Likewise.
	* dlfcn/Makefile: Likewise.
	* gmon/Makefile: Likewise.
	* gnulib/Makefile: Likewise.
	* grp/Makefile: Likewise.
	* gshadow/Makefile: Likewise.
	* hesiod/Makefile: Likewise.
	* hurd/Makefile: Likewise.
	(all): Remove target.
	* iconvdata/Makefile: Include Makeconfig immediately after
	defining subdir.
	* inet/Makefile: Likewise.
	* intl/Makefile: Likewise.
	* io/Makefile: Likewise.
	* libio/Makefile: Likewise.
	(all): Remove target.
	* locale/Makefile: Include Makeconfig immediately after defining
	subdir.
	* login/Makefile: Likewise.
	* mach/Makefile: Likewise.
	(all): Remove target.
	* malloc/Makefile: Include Makeconfig immediately after defining
	subdir.
	(all): Remove target.
	* manual/Makefile: Include Makeconfig immediately after defining
	subdir.
	* math/Makefile: Likewise.
	* misc/Makefile: Likewise.
	* nis/Makefile: Likewise.
	* nss/Makefile: Likewise.
	* po/Makefile: Likewise.
	(all): Remove target.
	* posix/Makefile: Include Makeconfig immediately after defining
	subdir.
	* pwd/Makefile: Likewise.
	* resolv/Makefile: Likewise.
	* resource/Makefile: Likewise.
	* rt/Makefile: Likewise.
	* setjmp/Makefile: Likewise.
	* shadow/Makefile: Likewise.
	* signal/Makefile: Likewise.
	* socket/Makefile: Likewise.
	* soft-fp/Makefile: Likewise.
	* stdio-common/Makefile: Likewise.
	* stdlib/Makefile: Likewise.
	* streams/Makefile: Likewise.
	* string/Makefile: Likewise.
	* sunrpc/Makefile: Likewise.
	(all): Remove target.
	* sysvipc/Makefile: Include Makeconfig immediately after defining
	subdir.
	* termios/Makefile: Likewise.
	* time/Makefile: Likewise.
	* timezone/Makefile: Likewise.
	(all): Remove target.
	* wcsmbs/Makefile: Include Makeconfig immediately after defining
	subdir.
	* wctype/Makefile: Likewise.

libidn/ChangeLog:
	* Makefile: Include Makeconfig immediately after defining subdir.

localedata/ChangeLog:
	* Makefile: Include Makeconfig immediately after defining subdir.
	(all): Remove target.

nptl/ChangeLog:
	* Makefile: Include Makeconfig immediately after defining subdir.

nptl_db/ChangeLog:
	* Makefile: Include Makeconfig immediately after defining subdir.

62 files changed, 205 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index 157649be53..4ef5ccc317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,76 @@
+2014-02-26  Joseph Myers  <joseph@codesourcery.com>
+
+	* argp/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* assert/Makefile: Likewise.
+	* benchtests/Makefile: Likewise.
+	* catgets/Makefile: Likewise.
+	* conform/Makefile: Likewise.
+	* crypt/Makefile: Likewise.
+	* csu/Makefile: Likewise.
+	(all): Remove target.
+	* ctype/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* debug/Makefile: Likewise.
+	* dirent/Makefile: Likewise.
+	* dlfcn/Makefile: Likewise.
+	* gmon/Makefile: Likewise.
+	* gnulib/Makefile: Likewise.
+	* grp/Makefile: Likewise.
+	* gshadow/Makefile: Likewise.
+	* hesiod/Makefile: Likewise.
+	* hurd/Makefile: Likewise.
+	(all): Remove target.
+	* iconvdata/Makefile: Include Makeconfig immediately after
+	defining subdir.
+	* inet/Makefile: Likewise.
+	* intl/Makefile: Likewise.
+	* io/Makefile: Likewise.
+	* libio/Makefile: Likewise.
+	(all): Remove target.
+	* locale/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* login/Makefile: Likewise.
+	* mach/Makefile: Likewise.
+	(all): Remove target.
+	* malloc/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	(all): Remove target.
+	* manual/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* math/Makefile: Likewise.
+	* misc/Makefile: Likewise.
+	* nis/Makefile: Likewise.
+	* nss/Makefile: Likewise.
+	* po/Makefile: Likewise.
+	(all): Remove target.
+	* posix/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* pwd/Makefile: Likewise.
+	* resolv/Makefile: Likewise.
+	* resource/Makefile: Likewise.
+	* rt/Makefile: Likewise.
+	* setjmp/Makefile: Likewise.
+	* shadow/Makefile: Likewise.
+	* signal/Makefile: Likewise.
+	* socket/Makefile: Likewise.
+	* soft-fp/Makefile: Likewise.
+	* stdio-common/Makefile: Likewise.
+	* stdlib/Makefile: Likewise.
+	* streams/Makefile: Likewise.
+	* string/Makefile: Likewise.
+	* sunrpc/Makefile: Likewise.
+	(all): Remove target.
+	* sysvipc/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* termios/Makefile: Likewise.
+	* time/Makefile: Likewise.
+	* timezone/Makefile: Likewise.
+	(all): Remove target.
+	* wcsmbs/Makefile: Include Makeconfig immediately after defining
+	subdir.
+	* wctype/Makefile: Likewise.
+
 2014-02-26  Steve Ellcey  <sellcey@mips.com>
 
 	* sysdeps/mips/math_private.h (_FPU_MASK_ALL) New.
diff --git a/argp/Makefile b/argp/Makefile
index 35f1088a26..997424e2f8 100644
--- a/argp/Makefile
+++ b/argp/Makefile
@@ -20,6 +20,8 @@
 #
 subdir	:= argp
 
+include ../Makeconfig
+
 headers		= argp.h
 routines	= $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
 				     pvh xinl eexst)
diff --git a/assert/Makefile b/assert/Makefile
index 60ec53d001..97fb476cd6 100644
--- a/assert/Makefile
+++ b/assert/Makefile
@@ -19,6 +19,9 @@
 #	Sub-makefile for assert portion of the library.
 #
 subdir	:= assert
+
+include ../Makeconfig
+
 headers	:= assert.h
 
 routines := assert assert-perr __assert
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 8bfb03917e..55d957af35 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -20,6 +20,9 @@
 # Add benchmark functions in alphabetical order.
 
 subdir := benchtests
+
+include ../Makeconfig
+
 bench := acos acosh asin asinh atan atanh cos cosh exp exp2 log log2 modf pow \
 	 rint sin sincos sinh sqrt tan tanh
 
@@ -65,7 +68,6 @@ LDLIBS-bench-sincos = -lm
 # affect their performance.
 .NOTPARALLEL:
 
-include ../Makeconfig
 include ../Rules
 
 binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
diff --git a/catgets/Makefile b/catgets/Makefile
index 7c2a1170e1..899d929db6 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -20,6 +20,8 @@
 #
 subdir	:= catgets
 
+include ../Makeconfig
+
 headers		= nl_types.h
 routines	= catgets open_catalog
 others		= gencat
diff --git a/conform/Makefile b/conform/Makefile
index 0761a1c294..41f0bb3f57 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -20,6 +20,8 @@
 #
 subdir	:= conform
 
+include ../Makeconfig
+
 include ../Rules
 
 ifneq (yes,$(fast-check))
diff --git a/crypt/Makefile b/crypt/Makefile
index 9f69ecbdb7..b1645dee55 100644
--- a/crypt/Makefile
+++ b/crypt/Makefile
@@ -20,6 +20,8 @@
 #
 subdir	:= crypt
 
+include ../Makeconfig
+
 headers := crypt.h
 
 extra-libs := libcrypt
@@ -30,8 +32,6 @@ libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
 
 tests := cert md5c-test sha256c-test sha512c-test badsalttest
 
-include ../Makeconfig
-
 ifeq ($(crypt-in-libc),yes)
 routines += $(libcrypt-routines)
 endif
diff --git a/csu/Makefile b/csu/Makefile
index b5afea0dec..ebd4b4efed 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -24,6 +24,8 @@
 
 subdir := csu
 
+include ../Makeconfig
+
 routines = init-first libc-start $(libc-init) sysdep version check_fds \
 	   libc-tls elf-init dso_handle
 aux	 = errno
@@ -43,10 +45,6 @@ before-compile = $(objpfx)version-info.h
 tests := tst-empty tst-atomic tst-atomic-long
 tests-static := tst-empty
 
-all: # Make this the default target; it will be defined in Rules.
-
-include ../Makeconfig
-
 ifeq (yes,$(build-shared))
 extra-objs += S$(start-installed-name)
 install-lib += S$(start-installed-name)
diff --git a/ctype/Makefile b/ctype/Makefile
index 7bfc928425..8a41f9c499 100644
--- a/ctype/Makefile
+++ b/ctype/Makefile
@@ -19,6 +19,9 @@
 #	Sub-makefile for ctype portion of the library.
 #
 subdir	:= ctype
+
+include ../Makeconfig
+
 headers	:= ctype.h
 
 routines	:= ctype ctype-extn ctype_l isctype
diff --git a/debug/Makefile b/debug/Makefile
index fc15ef3aec..963460ecf9 100644
--- a/