From 4ae73ca00adbf6bf54bafe93d1318e3446af5919 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Fri, 9 Apr 2010 15:18:58 -0700
Subject: [PATCH] Revert "Shorten build commands"

This reverts commit 59d9f1d6983fc9b606a1f9214fb817efe3d6cff8.
---
 ChangeLog  |  8 --------
 Makeconfig |  5 ++---
 Makefile   |  2 +-
 Makerules  | 14 --------------
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c80d69674..7d8f1cded9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,14 +16,6 @@
 	* malloc/malloc.c (_int_malloc): Return NULL if printing error message
 	returns.
 
-2010-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makeconfig (+common-includes): Define.
-	(+includes): Use @$(common-objpfx)includes.
-	* Makefile (postclean): Remove includes and includes.mk.
-	* Makerules ($(common-objpfx)includes.mk): Include and create
-	includes.mk.  Create includes.
-
 2010-04-07  Andreas Schwab  <schwab@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/fallocate.c: Set errno on error.
diff --git a/Makeconfig b/Makeconfig
index dc81545070..cd77fe16b8 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -670,10 +670,9 @@ endif	# $(+cflags) == ""
 # library source directory, in the include directory, and in the
 # current directory.
 +sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
-+common-includes = $(+sysdep-includes) $(includes) $(sysincludes)
 +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
-	    @$(common-objpfx)includes \
-	    $(patsubst %/,-I%,$(..)) $(libio-include) -I.
+	    $(+sysdep-includes) $(includes) \
+	    $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
 
 # Since libio has several internal header files, we use a -I instead
 # of many little headers in the include directory.
diff --git a/Makefile b/Makefile
index d2327b3cd9..61cfa436c4 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
 parent-clean: parent-mostlyclean common-clean
 
 postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
-	    $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \
+	    $(addprefix $(objpfx),sysd-dirs sysd-rules) \
 	    $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
 
 clean: parent-clean
diff --git a/Makerules b/Makerules
index 9986730d97..bf03b38a9c 100644
--- a/Makerules
+++ b/Makerules
@@ -267,20 +267,6 @@ ifndef sysd-rules-done
 no_deps=t
 endif
 
--include $(common-objpfx)includes.mk
-ifneq ($(+common-includes),$(saved-includes))
-# Recreate includes.mk (and includes).
-includes-force = FORCE
-FORCE:
-endif
-$(common-objpfx)includes.mk: $(includes-force)
-	-@rm -f $@T $(common-objpfx)includesT
-	for inc in $(+common-includes); do echo "$$inc"; done \
-	  > $(common-objpfx)includesT
-	mv -f $(common-objpfx)includesT $(common-objpfx)includes
-	echo 'saved-includes := $(+common-includes)' > $@T
-	mv -f $@T $@
-
 define o-iterator-doit
 $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
 endef
-- 
2.11.4.GIT