From patchwork Tue Mar 17 23:30:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6035421 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A6EE89F7BC for ; Tue, 17 Mar 2015 23:30:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5AD920435 for ; Tue, 17 Mar 2015 23:30:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B5A5A2041D for ; Tue, 17 Mar 2015 23:30:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE7426E0FD; Tue, 17 Mar 2015 16:30:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BEC56E0FD for ; Tue, 17 Mar 2015 16:30:22 -0700 (PDT) Received: by wetk59 with SMTP id k59so19270529wet.3 for ; Tue, 17 Mar 2015 16:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YVAPbLKl80aT+1Tt3oGhYTszI1NK6CcvKxFcjFsU6cQ=; b=alX+aUpVDa1rtFH3OANH/1PBxZoIsUrL5BMNRcSDyAxeePg7PnAkbRUPyaQv8Vhzyb /2EY8KcxcEWkBkL9BHUkB7LNuFtrl73t7p3rKdTQnHzMBSlza5i99clujr7plgIoE0KM LBbvTLGewKg+4Gl31gM3B/A5lHBXC6We4Tbyd62cSEguHOow8GFztJ8F9WjtmK2rV/B0 jU8qWGAkFZmNPl+rQNkBFEU0lvA23wjZhz5+11nkMJ1BLdUeejc4dlwVecSa7kFgwFLN UMV/pC1jykKBCjITt+DNbjznUeh7s84KROsyASIEOlSSUQyQYG53DcsKYLkY7PpAf+lN SCiQ== X-Received: by 10.194.19.166 with SMTP id g6mr138616195wje.150.1426635021632; Tue, 17 Mar 2015 16:30:21 -0700 (PDT) Received: from arch-laptop.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id hi6sm21937605wjc.34.2015.03.17.16.30.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Mar 2015 16:30:20 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 2/5] android: simplify LOCAL_C_INCLUDES Date: Tue, 17 Mar 2015 23:30:09 +0000 Message-Id: <1426635012-27971-3-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1426635012-27971-1-git-send-email-emil.l.velikov@gmail.com> References: <1426635012-27971-1-git-send-email-emil.l.velikov@gmail.com> Cc: Emil Velikov , Chih-Wei Huang X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Each of the libdrm_${hw} modules pull libdrm for linking as such: libdrm's LOCAL_EXPORT_C_INCLUDE_DIRS are added to the includes list. The former of which is already set to ${top} and ${top}/include/drm. Signed-off-by: Emil Velikov --- freedreno/Android.mk | 4 +--- intel/Android.mk | 2 -- libkms/Android.mk | 2 -- nouveau/Android.mk | 4 +--- radeon/Android.mk | 4 +--- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 31b90ef..d6c19fe 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ - $(LIBDRM_TOP) \ - $(LIBDRM_TOP)/freedreno \ - $(LIBDRM_TOP)/include/drm + $(LIBDRM_TOP)/freedreno LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 diff --git a/intel/Android.mk b/intel/Android.mk index 2a6bf60..8a30fb5 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -34,9 +34,7 @@ LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ - $(LIBDRM_TOP) \ $(LIBDRM_TOP)/intel \ - $(LIBDRM_TOP)/include/drm \ external/libpciaccess/include LOCAL_CFLAGS := \ diff --git a/libkms/Android.mk b/libkms/Android.mk index 4d41fbc..3c400de 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -47,8 +47,6 @@ LOCAL_SHARED_LIBRARIES := libdrm LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm - LOCAL_COPY_HEADERS_TO := libdrm LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES) diff --git a/nouveau/Android.mk b/nouveau/Android.mk index 8e42c40..6c46f6c 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ - $(LIBDRM_TOP) \ - $(LIBDRM_TOP)/nouveau \ - $(LIBDRM_TOP)/include/drm + $(LIBDRM_TOP)/nouveau LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 diff --git a/radeon/Android.mk b/radeon/Android.mk index b4065aa..d9192b6 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ - $(LIBDRM_TOP) \ - $(LIBDRM_TOP)/radeon \ - $(LIBDRM_TOP)/include/drm + $(LIBDRM_TOP)/radeon LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1