From patchwork Sun Sep 7 21:30:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 4859451 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D479EC033C for ; Sun, 7 Sep 2014 21:31:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 357EC20122 for ; Sun, 7 Sep 2014 21:31:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 529C920120 for ; Sun, 7 Sep 2014 21:31:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8438389725; Sun, 7 Sep 2014 14:31:37 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 290B06E173 for ; Sun, 7 Sep 2014 14:31:36 -0700 (PDT) Received: by mail-we0-f182.google.com with SMTP id w62so14035202wes.13 for ; Sun, 07 Sep 2014 14:31:35 -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=IfNZJuyRXVvGPDh1q916lhWMHwgfpleXOutCTvQJ4S4=; b=FcrL8Zn9ggXr8Q85P/O6XBwEyQlHZtBAKIGtk31fMyc1uvWPgHbTOx9NWWHWHoiLyV N52R0l45+Ci8yjV+klLIdJvaszMGsVw6hI15FueFsVLorZfy8vAKpX2wFMldHI5RoySs rJUpq484BmB/Hq089DKAFASixa3K4vvQzPlokBF0uI5/KwP3KmnUteGFkHHintVvwLi+ jZM/kgxbghpFQTdRK/JwfP+W4J2btI+gtSA/Wad/ML5x65cYgLwWh744ga5xVYWTo+V8 BZzle14ROaWV8B5EWYFSNkPf1qEgu/rtLWlscR7uj7vX/qZ3hXOYGHou/Qpf6T81/85+ rkig== X-Received: by 10.194.80.9 with SMTP id n9mr30424821wjx.57.1410125495365; Sun, 07 Sep 2014 14:31:35 -0700 (PDT) Received: from localhost.localdomain (cpc20-stap10-2-0-cust563.12-2.cable.virginm.net. [82.20.130.52]) by mx.google.com with ESMTPSA id ub19sm9644662wib.9.2014.09.07.14.31.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Sep 2014 14:31:34 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 11/18] automake: pick up all files for distribution. Date: Sun, 7 Sep 2014 22:30:06 +0100 Message-Id: <1410125413-19465-12-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1410125413-19465-1-git-send-email-emil.l.velikov@gmail.com> References: <1410125413-19465-1-git-send-email-emil.l.velikov@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-5.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Autotools is already smart enough to pick the *.pc.in files but it needs some help with the Android.mk ones. Signed-off-by: Emil Velikov --- Makefile.am | 2 +- freedreno/Makefile.am | 2 ++ intel/Makefile.am | 3 ++- libkms/Makefile.am | 2 +- nouveau/Makefile.am | 2 ++ radeon/Makefile.am | 2 +- tests/modetest/Makefile.am | 2 ++ 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 884841f..3952a88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ libdrm_la_SOURCES = $(LIBDRM_FILES) libdrmincludedir = ${includedir} libdrminclude_HEADERS = $(LIBDRM_H_FILES) -EXTRA_DIST = libdrm.pc.in +EXTRA_DIST = Android.mk klibdrmincludedir = ${includedir}/libdrm klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 0c7db81..4818431 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -21,3 +21,5 @@ libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_freedreno.pc + +EXTRA_DIST = Android.mk diff --git a/intel/Makefile.am b/intel/Makefile.am index 846695d..ca4ed84 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -68,7 +68,8 @@ EXTRA_DIST = \ $(BATCHES:.batch=.batch.sh) \ $(BATCHES:.batch=.batch-ref.txt) \ $(BATCHES:.batch=.batch-ref.txt) \ - tests/test-batch.sh + tests/test-batch.sh \ + Android.mk test_decode_LDADD = libdrm_intel.la ../libdrm.la diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 21c65ae..4baf4fc 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -43,4 +43,4 @@ libkmsinclude_HEADERS = $(LIBKMS_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libkms.pc -EXTRA_DIST = libkms.pc.in +EXTRA_DIST = Android.mk diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index a7df1ab..7543e43 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -21,3 +21,5 @@ libdrm_nouveauinclude_HEADERS = $(LIBDRM_NOUVEAU_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_nouveau.pc + +EXTRA_DIST = Android.mk diff --git a/radeon/Makefile.am b/radeon/Makefile.am index aa66ca3..4575065 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -45,4 +45,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_radeon.pc -EXTRA_DIST = libdrm_radeon.pc.in +EXTRA_DIST = Android.mk diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index d551fe4..0a6af01 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -25,3 +25,5 @@ if HAVE_CAIRO AM_CFLAGS += $(CAIRO_CFLAGS) modetest_LDADD += $(CAIRO_LIBS) endif + +EXTRA_DIST = Android.mk