From patchwork Tue Nov 6 11:55:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 197473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 325C02C00C8 for ; Tue, 6 Nov 2012 22:55:56 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1352807757; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To: User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=Tv7jM/l 5wacR0IdEw7+c0QPYNS0=; b=lmkBDrMy4MHjW8V0Hoev0gk3ItxPOqCtl01ev+0 atsCMpJAMFVh9k2JnuYZfSLoZcHnGlBZ2M7O6ZhaJg4LVpVqp2YWo+RkfnJsYE9p lsF30zBEuayiCHIVOLshspYZwe+oO+eIhAQFU7Cz3tLI6gvBADc0/vAJEhE/PLYC x6NA= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Subject:Message-ID:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=FgARvLq76QKT+loL3eyxCDAGat4JNEZsTnKkvjj5EmcJ4neSQyOpBhGUR4CFhN pVSUPpzo9p+WMRaq4J8g2wWG/OZ/TpPEcpzR3EZHbHhpws53m5On820d158ryPED bAUk+HLGsIFTa2nASAwvkilLSe9kkMSmPiAbq0TdwDDaw=; Received: (qmail 9079 invoked by alias); 6 Nov 2012 11:55:52 -0000 Received: (qmail 9063 invoked by uid 22791); 6 Nov 2012 11:55:51 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL, BAYES_00, KHOP_SPAMHAUS_DROP, TW_JL, TW_ZC X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 06 Nov 2012 11:55:46 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 5B741CB04E5 for ; Tue, 6 Nov 2012 12:55:46 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aVqea7f4ttrg for ; Tue, 6 Nov 2012 12:55:46 +0100 (CET) Received: from chelles.act-europe.fr (chelles.act-europe.fr [10.10.0.160]) by mel.act-europe.fr (Postfix) with ESMTP id 4831CCB021E for ; Tue, 6 Nov 2012 12:55:46 +0100 (CET) Received: by chelles.act-europe.fr (Postfix, from userid 525) id 36D231EA005A; Tue, 6 Nov 2012 12:55:46 +0100 (CET) Date: Tue, 6 Nov 2012 12:55:46 +0100 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Subject: Re: [Ada] clean ups in Makefiles Message-ID: <20121106115546.GA25922@adacore.com> References: <20121106090654.GA6005@adacore.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121106090654.GA6005@adacore.com> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The previous patch is further cleaned up by removing the osconstool target in libada/Makefile.in which was hard to maintain. Tested on x86_64-pc-linux-gnu, committed on trunk. libada/ * Makefile.in (osconstool): Removed, no longer needed. ada/ * gcc-interface/Makefile.in: Improve handling of s-oscons.ads. Index: libada/Makefile.in =================================================================== --- libada/Makefile.in (revision 193215) +++ libada/Makefile.in (working copy) @@ -94,7 +94,7 @@ LIBADA_FLAGS_TO_PASS = \ .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool gnatlib: @default_gnatlib_target@ -gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile +gnatlib-plain: $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ && touch stamp-libada @@ -103,7 +103,7 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib -gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile +gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ && touch stamp-libada @@ -112,9 +112,6 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib -osconstool: - $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads - install-gnatlib: $(GCC_DIR)/ada/Makefile $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib Index: gcc-interface/Makefile.in =================================================================== --- gcc-interface/Makefile.in (revision 193215) +++ gcc-interface/Makefile.in (working copy) @@ -2577,13 +2604,14 @@ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) # Copy tsystem.h $(CP) $(srcdir)/tsystem.h $(RTSDIR) -# Copy generated target dependent sources - $(RM) $(RTSDIR)/s-oscons.ads - (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) -gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) +$(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) + $(RM) $(RTSDIR)/s-oscons.ads + (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) + +gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads # C files $(MAKE) -C $(RTSDIR) \ CC="`echo \"$(GCC_FOR_TARGET)\" \