From patchwork Fri Mar 12 12:50:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pauli Nieminen X-Patchwork-Id: 85253 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2CCoiW2017248 for ; Fri, 12 Mar 2010 12:51:20 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B353B9FD69; Fri, 12 Mar 2010 04:50:44 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from filtteri6.pp.htv.fi (filtteri6.pp.htv.fi [213.243.153.189]) by gabe.freedesktop.org (Postfix) with ESMTP id 13CBA9F78F for ; Fri, 12 Mar 2010 04:50:43 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id 32AA656E0C7; Fri, 12 Mar 2010 14:50:41 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id jiYPgd-M+k1N; Fri, 12 Mar 2010 14:50:40 +0200 (EET) Received: from localhost.localdomain (cs181130083.pp.htv.fi [82.181.130.83]) by smtp4.welho.com (Postfix) with ESMTP id DE5825BC010; Fri, 12 Mar 2010 14:50:40 +0200 (EET) From: Pauli Nieminen To: dri-devel@lists.sourceforge.net Date: Fri, 12 Mar 2010 14:50:35 +0200 Message-Id: <1268398235-21806-3-git-send-email-suokkos@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268398235-21806-2-git-send-email-suokkos@gmail.com> References: <1268398235-21806-1-git-send-email-suokkos@gmail.com> <1268398235-21806-2-git-send-email-suokkos@gmail.com> Cc: nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 3/3] libdrm: Move all noninstalled headers to noinst_HEADERS. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 12 Mar 2010 12:51:20 +0000 (UTC) diff --git a/Makefile.am b/Makefile.am index e434e1d..61da186 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,13 +55,13 @@ libdrm_la_SOURCES = \ xf86drmHash.c \ xf86drmRandom.c \ xf86drmSL.c \ - xf86drmMode.c \ - libdrm_lists.h + xf86drmMode.c libdrmincludedir = ${includedir} libdrminclude_HEADERS = xf86drm.h xf86drmMode.h -noinst_HEADERS = xf86atomic.h +noinst_HEADERS = xf86atomic.h \ + libdrm_lists.h EXTRA_DIST = libdrm.pc.in include/drm/* diff --git a/intel/Makefile.am b/intel/Makefile.am index 9add505..d56b03a 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -36,14 +36,16 @@ libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ intel_bufmgr.c \ - intel_bufmgr_priv.h \ intel_bufmgr_fake.c \ intel_bufmgr_gem.c \ - intel_chipset.h \ - mm.c \ - mm.h + mm.c libdrm_intelincludedir = ${includedir} libdrm_intelinclude_HEADERS = intel_bufmgr.h +noinst_HEADERS = \ + intel_bufmgr_priv.h \ + intel_chipset.h \ + mm.h + pkgconfig_DATA = libdrm_intel.pc diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 5d759c5..53099eb 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -18,7 +18,6 @@ libdrm_nouveau_la_SOURCES = \ nouveau_notifier.c \ nouveau_bo.c \ nouveau_resource.c \ - nouveau_private.h \ nouveau_reloc.c libdrm_nouveaucommonincludedir = ${includedir}/nouveau @@ -38,5 +37,8 @@ libdrm_nouveauincludedir = ${includedir}/drm libdrm_nouveauinclude_HEADERS = \ nouveau_drmif.h +noinst_HEADERS = \ + nouveau_private.h + pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_nouveau.pc