From patchwork Fri Dec 8 15:21:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Landwerlin X-Patchwork-Id: 10102779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C32A260329 for ; Fri, 8 Dec 2017 15:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1206128619 for ; Fri, 8 Dec 2017 15:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06C7D28D6A; Fri, 8 Dec 2017 15:21:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8298A28619 for ; Fri, 8 Dec 2017 15:21:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D7046E925; Fri, 8 Dec 2017 15:21:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB1406E924 for ; Fri, 8 Dec 2017 15:21:49 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Dec 2017 07:21:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,378,1508828400"; d="scan'208";a="157090320" Received: from delly.ld.intel.com ([10.103.238.204]) by orsmga004.jf.intel.com with ESMTP; 08 Dec 2017 07:21:48 -0800 From: Lionel Landwerlin To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Dec 2017 15:21:38 +0000 Message-Id: <20171208152144.10976-2-lionel.g.landwerlin@intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171208152144.10976-1-lionel.g.landwerlin@intel.com> References: <20171208152144.10976-1-lionel.g.landwerlin@intel.com> Subject: [Intel-gfx] [PATCH i-g-t v3 1/7] debugger/overlay/tools: make sure to include embedded drm-uapi headers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Headers from lib/ depend on drm uapi headers. Since we started embedding them, let's make sure to pull them first. We still depend on libdrm in places, we don't want the system headers from libdrm to be included prior to the embedded ones. v2: Fix debugger/overlay (Lionel) Signed-off-by: Lionel Landwerlin --- debugger/Makefile.am | 3 ++- overlay/Makefile.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debugger/Makefile.am b/debugger/Makefile.am index 9d231d3f..ceaab6f8 100644 --- a/debugger/Makefile.am +++ b/debugger/Makefile.am @@ -6,7 +6,8 @@ noinst_PROGRAMS = debug_rdata AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include/drm-uapi AM_CFLAGS = \ $(DRM_CFLAGS) \ diff --git a/overlay/Makefile.am b/overlay/Makefile.am index f49f54ac..fca04cae 100644 --- a/overlay/Makefile.am +++ b/overlay/Makefile.am @@ -2,7 +2,7 @@ if BUILD_OVERLAY bin_PROGRAMS = intel-gpu-overlay endif -AM_CPPFLAGS = -I. +AM_CPPFLAGS = -I. -I$(top_srcdir)/include/drm-uapi AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CFLAGS) -I$(srcdir)/../lib LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS) $(top_builddir)/lib/libigt_perf.la diff --git a/tools/Makefile.am b/tools/Makefile.am index a8196f07..dcf282ea 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,7 +15,7 @@ endif SUBDIRS = null_state_gen registers -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi -I$(top_srcdir)/lib AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DIGT_DATADIR=\"$(pkgdatadir)\" \ $(WERROR_CFLAGS) -D_GNU_SOURCE