From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-20579-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 14277 invoked by alias); 3 Dec 2002 16:14:59 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 14250 invoked from network); 3 Dec 2002 16:14:55 -0000
Received: from unknown (HELO mailout6-0.nyroc.rr.com) (24.92.226.125)
  by sources.redhat.com with SMTP; 3 Dec 2002 16:14:55 -0000
Received: from doctormoo (syr-24-24-16-193.twcny.rr.com [24.24.16.193])
	by mailout6-0.nyroc.rr.com (8.11.6/RoadRunner 1.20) with ESMTP id gB3GEqk17959;
	Tue, 3 Dec 2002 11:14:52 -0500 (EST)
Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian))
	id 18JFgV-00006N-00; Tue, 03 Dec 2002 11:14:07 -0500
Date: Tue, 03 Dec 2002 08:14:00 -0000
To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com,
   binutils@sources.redhat.com, dj@redhat.com
Subject: (toplevel patch) Real make targets for configure-build-*
Message-ID: <20021203161407.GA392@doctormoo>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
From: Nathanael Nerode <neroden@twcny.rr.com>
X-SW-Source: 2002-12/txt/msg00067.txt.bz2

Use the real target $(BUILD_SUBDIR)/*/Makefile for the target 
configure-build-*.  Enables lots of simplification.  Tested thoroughly
on i686-pc-linux-gnu.  Corresponding patch for configure-target-* coming
soon.  Reformatting is not done here; I'll do a reindentation pass after I
delete most of the ifs I'm going to delete.

	* Makefile.tpl: Realize configure-build-* targets.
	* Makefile.in: Regenerate.

--- Makefile.tpl.base	2002-12-03 11:00:50.000000000 -0500
+++ Makefile.tpl	2002-12-03 11:10:17.000000000 -0500
@@ -795,14 +795,9 @@
 [+ FOR build_modules +]
 .PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
 maybe-configure-build-[+module+]:
-configure-build-[+module+]:
-	@if [ ! -d $(BUILD_SUBDIR) ]; then \
-	  true; \
-	elif [ -f $(BUILD_SUBDIR)/[+module+]/Makefile ] ; then \
-	  true; \
-	elif echo " $(BUILD_CONFIGDIRS) " | grep " [+module+] " >/dev/null 2>&1; then \
-	  if [ -d $(srcdir)/[+module+] ]; then \
-	    [ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
+configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
+$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
+	@[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
 	    r=`${PWD}`; export r; \
 	    s=`cd $(srcdir); ${PWD}`; export s; \
 	    AR="$(AR_FOR_BUILD)"; export AR; \
@@ -857,24 +852,14 @@
 	    CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 	      $(BUILD_CONFIGARGS) $${srcdiroption} \
 	      --with-build-subdir="$(BUILD_SUBDIR)" \
-	      || exit 1; \
-	  else \
-	    true; \
-	  fi; \
-	else \
-	  true; \
-	fi
+	      || exit 1
 
 .PHONY: all-build-[+module+] maybe-all-build-[+module+]
 maybe-all-build-[+module+]:
 all-build-[+module+]: configure-build-[+module+]
-	@if [ -f ./[+module+]/Makefile ] ; then \
-	  r=`${PWD}`; export r; \
+	@r=`${PWD}`; export r; \
 	  s=`cd $(srcdir); ${PWD}`; export s; \
-	  (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all); \
-	else \
-	  true; \
-	fi
+	  (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
 [+ ENDFOR build_modules +]
 
 # --------------------------------------