From patchwork Wed Jan 23 17:29:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31197 Received: (qmail 18263 invoked by alias); 23 Jan 2019 17:30:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 17643 invoked by uid 89); 23 Jan 2019 17:30:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=H*RU:100.42.49.20, H*RU:sk:cm17.we, Hx-spam-relays-external:sk:cm17.we, Hx-spam-relays-external:100.42.49.20 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.150.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Jan 2019 17:29:59 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 0AEDB51008 for ; Wed, 23 Jan 2019 11:29:58 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id mMLegDj2D90onmMLegf2Yc; Wed, 23 Jan 2019 11:29:58 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2Tz+MZJeR2iE4fN6Aaudu1vdyZHYhFX3/+VrqkUEbvI=; b=iuyA0sPJ3BZHkO44joFgpQkY7e y4cqs2lWoEXAqOwYEstLedjIXjoOwtyKN2XWaNI8tFrM0micJrI+VgUvh8Ta+Uy8HUfmvpS9fzxNF iVzS7aOeCBoo7vasqdrRrFOla; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:37850 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gmMLd-001oW4-Pp; Wed, 23 Jan 2019 11:29:57 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/3] Don't use -I for common subdirectory Date: Wed, 23 Jan 2019 10:29:54 -0700 Message-Id: <20190123172954.24421-4-tom@tromey.com> In-Reply-To: <20190123172954.24421-1-tom@tromey.com> References: <20190123172954.24421-1-tom@tromey.com> This changes the Makefiles to remove the -I for the common/ subdirectory. This will enforce the rule that includes must use the 'common/filename.h' form. 2019-01-23 Tom Tromey * Makefile.in (GDB_CFLAGS): Don't add -I for common. gdb/gdbserver/ChangeLog 2019-01-23 Tom Tromey * Makefile.in (INCLUDE_CFLAGS): Don't add -I for common. --- gdb/ChangeLog | 4 ++++ gdb/Makefile.in | 2 +- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/Makefile.in | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 215ef7933c..72ca855eb0 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -543,7 +543,7 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # your system doesn't have fcntl.h in /usr/include (which is where it # should be according to Posix). DEFS = @DEFS@ -GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/common -I$(srcdir)/config \ +GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \ -DLOCALEDIR="\"$(localedir)\"" $(DEFS) # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 4ae13692a2..8cffe3dda2 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -118,7 +118,7 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@ # in those directories should be included with the subdirectory. # e.g.: "target/wait.h". # -INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../common \ +INCLUDE_CFLAGS = -I. -I${srcdir} \ -I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \ $(INCGNU)