From patchwork Sun Aug 24 18:28:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 4770771 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 A261DC0338 for ; Sun, 24 Aug 2014 18:29:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5527820127 for ; Sun, 24 Aug 2014 18:29:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A86752011E for ; Sun, 24 Aug 2014 18:29:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFA5C6E1C7; Sun, 24 Aug 2014 11:29:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F4DA6E1C7 for ; Sun, 24 Aug 2014 11:29:31 -0700 (PDT) Received: by mail-wi0-f178.google.com with SMTP id hi2so1611193wib.5 for ; Sun, 24 Aug 2014 11:29:30 -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 :mime-version:content-type:content-transfer-encoding; bh=Y+JmYZTbHpC0IpVsx/DmW9hsheb4hx4yR2v17hO+neM=; b=kuVrkNcgz0fRgAZVKBuRrGbO0GSCt6zTPzok+LkCk/2OoUhdfRAwp/MDwM1UeWnJGU 1RVgH+jeYtAflUOB8Liap7EbqeZiM19SWMNW8JFsk58ApwXT2aDTo0kKXzE/VzaytCJw 4ryQbrsuDKelUqtnS98JPIxXiuPR/numUrDKWYo32P+x2wrZmar/m0fdP8Vi/p4bhvuh vxRntfhoLapq/qkHu9iPW9YGuCXeji3e9jffrx7/92erMVq/WWDPyOVqBhtgaXnYZIYT U+P0JRbc2hI8xeJIaFY6Z2zsGXu2SaAWVSirIu8PttIze43DXxxfHz9H6VlQtxDZp0sV XPfg== X-Received: by 10.194.191.165 with SMTP id gz5mr17824343wjc.16.1408904969980; Sun, 24 Aug 2014 11:29:29 -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 dc9sm22964065wib.5.2014.08.24.11.29.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Aug 2014 11:29:29 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCHv3 3/8] libdrm, freedreno, intel, nouveau, radeon: add Makefile.sources Date: Sun, 24 Aug 2014 19:28:50 +0100 Message-Id: <1408904930-464-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1406654843-13625-4-git-send-email-emil.l.velikov@gmail.com> References: <1406654843-13625-4-git-send-email-emil.l.velikov@gmail.com> MIME-Version: 1.0 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: , 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 Will be used to consolidate the required sources lists as well as the install-able headers. This is turn will help us to avoid the duplication with the upcoming Android build support. v2: Rename the headers variable to *_H_FILES. v3: Rebase on top of symbol visibility patches. Signed-off-by: Emil Velikov --- Makefile.am | 14 ++++---------- Makefile.sources | 13 +++++++++++++ freedreno/Makefile.am | 24 +++--------------------- freedreno/Makefile.sources | 24 ++++++++++++++++++++++++ include/drm/Makefile.am | 20 ++++---------------- include/drm/Makefile.sources | 18 ++++++++++++++++++ intel/Makefile.am | 16 ++++------------ intel/Makefile.sources | 14 ++++++++++++++ nouveau/Makefile.am | 11 ++++------- nouveau/Makefile.sources | 9 +++++++++ radeon/Makefile.am | 22 ++++------------------ radeon/Makefile.sources | 19 +++++++++++++++++++ 12 files changed, 120 insertions(+), 84 deletions(-) create mode 100644 Makefile.sources create mode 100644 freedreno/Makefile.sources create mode 100644 include/drm/Makefile.sources create mode 100644 intel/Makefile.sources create mode 100644 nouveau/Makefile.sources create mode 100644 radeon/Makefile.sources diff --git a/Makefile.am b/Makefile.am index 65680da..fab2a9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,8 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +include Makefile.sources + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} pkgconfigdir = @pkgconfigdir@ @@ -62,18 +64,10 @@ libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm AM_CFLAGS = \ $(VALGRIND_CFLAGS) -libdrm_la_SOURCES = \ - xf86drm.c \ - xf86drmHash.c \ - xf86drmRandom.c \ - xf86drmSL.c \ - xf86drmMode.c \ - xf86atomic.h \ - libdrm.h \ - libdrm_lists.h +libdrm_la_SOURCES = $(LIBDRM_FILES) libdrmincludedir = ${includedir} -libdrminclude_HEADERS = xf86drm.h xf86drmMode.h +libdrminclude_HEADERS = $(LIBDRM_H_FILES) EXTRA_DIST = libdrm.pc.in include/drm/* diff --git a/Makefile.sources b/Makefile.sources new file mode 100644 index 0000000..d078ca9 --- /dev/null +++ b/Makefile.sources @@ -0,0 +1,13 @@ +LIBDRM_FILES := \ + xf86drm.c \ + xf86drmHash.c \ + xf86drmRandom.c \ + xf86drmSL.c \ + xf86drmMode.c \ + xf86atomic.h \ + libdrm.h \ + libdrm_lists.h + +LIBDRM_H_FILES := \ + xf86drm.h \ + xf86drmMode.h diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 49471e9..0c7db81 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -1,4 +1,5 @@ AUTOMAKE_OPTIONS=subdir-objects +include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ @@ -13,29 +14,10 @@ libdrm_freedreno_ladir = $(libdir) libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -libdrm_freedreno_la_SOURCES = \ - freedreno_device.c \ - freedreno_pipe.c \ - freedreno_priv.h \ - freedreno_ringbuffer.c \ - freedreno_bo.c \ - kgsl/kgsl_bo.c \ - kgsl/kgsl_device.c \ - kgsl/kgsl_drm.h \ - kgsl/kgsl_pipe.c \ - kgsl/kgsl_priv.h \ - kgsl/kgsl_ringbuffer.c \ - kgsl/msm_kgsl.h \ - msm/msm_bo.c \ - msm/msm_device.c \ - msm/msm_drm.h \ - msm/msm_pipe.c \ - msm/msm_priv.h \ - msm/msm_ringbuffer.c \ - list.h +libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) libdrm_freedrenocommonincludedir = ${includedir}/freedreno -libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h +libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_freedreno.pc diff --git a/freedreno/Makefile.sources b/freedreno/Makefile.sources new file mode 100644 index 0000000..91020df --- /dev/null +++ b/freedreno/Makefile.sources @@ -0,0 +1,24 @@ +LIBDRM_FREEDRENO_FILES := \ + freedreno_device.c \ + freedreno_pipe.c \ + freedreno_priv.h \ + freedreno_ringbuffer.c \ + freedreno_bo.c \ + kgsl/kgsl_bo.c \ + kgsl/kgsl_device.c \ + kgsl/kgsl_drm.h \ + kgsl/kgsl_pipe.c \ + kgsl/kgsl_priv.h \ + kgsl/kgsl_ringbuffer.c \ + kgsl/msm_kgsl.h \ + msm/msm_bo.c \ + msm/msm_device.c \ + msm/msm_drm.h \ + msm/msm_pipe.c \ + msm/msm_priv.h \ + msm/msm_ringbuffer.c \ + list.h + +LIBDRM_FREEDRENO_H_FILES := \ + freedreno_drmif.h \ + freedreno_ringbuffer.h diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am index 2bc34d2..7a246ae 100644 --- a/include/drm/Makefile.am +++ b/include/drm/Makefile.am @@ -22,23 +22,11 @@ # however, r300 and via need their reg headers installed in order to build. # better solutions are welcome. +include Makefile.sources + klibdrmincludedir = ${includedir}/libdrm -klibdrminclude_HEADERS = \ - drm.h \ - drm_mode.h \ - drm_fourcc.h \ - drm_sarea.h \ - i915_drm.h \ - mga_drm.h \ - nouveau_drm.h \ - r128_drm.h \ - radeon_drm.h \ - savage_drm.h \ - sis_drm.h \ - via_drm.h \ - mach64_drm.h \ - qxl_drm.h +klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) if HAVE_VMWGFX -klibdrminclude_HEADERS += vmwgfx_drm.h +klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES) endif diff --git a/include/drm/Makefile.sources b/include/drm/Makefile.sources new file mode 100644 index 0000000..8e1b585 --- /dev/null +++ b/include/drm/Makefile.sources @@ -0,0 +1,18 @@ +LIBDRM_INCLUDE_H_FILES := \ + drm.h \ + drm_mode.h \ + drm_fourcc.h \ + drm_sarea.h \ + i915_drm.h \ + mga_drm.h \ + nouveau_drm.h \ + r128_drm.h \ + radeon_drm.h \ + savage_drm.h \ + sis_drm.h \ + via_drm.h \ + mach64_drm.h \ + qxl_drm.h + +LIBDRM_INCLUDE_VMWGFX_H_FILES := \ + vmwgfx_drm.h diff --git a/intel/Makefile.am b/intel/Makefile.am index f734b0b..846695d 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -22,6 +22,8 @@ # Authors: # Eric Anholt +include Makefile.sources + AM_CFLAGS = \ $(WARN_CFLAGS) \ $(VISIBILITY_CFLAGS) \ @@ -40,22 +42,12 @@ libdrm_intel_la_LIBADD = ../libdrm.la \ @PCIACCESS_LIBS@ \ @CLOCK_LIB@ -libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ - intel_bufmgr_priv.h \ - intel_bufmgr_fake.c \ - intel_bufmgr_gem.c \ - intel_decode.c \ - intel_chipset.h \ - mm.c \ - mm.h +libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES) intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99 libdrm_intelincludedir = ${includedir}/libdrm -libdrm_intelinclude_HEADERS = intel_bufmgr.h \ - intel_aub.h \ - intel_debug.h +libdrm_intelinclude_HEADERS = $(LIBDRM_INTEL_H_FILES) # This may be interesting even outside of "make check", due to the -dump option. noinst_PROGRAMS = test_decode diff --git a/intel/Makefile.sources b/intel/Makefile.sources new file mode 100644 index 0000000..7b2272c --- /dev/null +++ b/intel/Makefile.sources @@ -0,0 +1,14 @@ +LIBDRM_INTEL_FILES := \ + intel_bufmgr.c \ + intel_bufmgr_priv.h \ + intel_bufmgr_fake.c \ + intel_bufmgr_gem.c \ + intel_decode.c \ + intel_chipset.h \ + mm.c \ + mm.h + +LIBDRM_INTEL_H_FILES := \ + intel_bufmgr.h \ + intel_aub.h \ + intel_debug.h diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 73cff9f..a7df1ab 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -1,3 +1,5 @@ +include Makefile.sources + AM_CFLAGS = \ $(WARN_CFLAGS) \ $(VISIBILITY_CFLAGS) \ @@ -12,15 +14,10 @@ libdrm_nouveau_ladir = $(libdir) libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -libdrm_nouveau_la_SOURCES = nouveau.c \ - pushbuf.c \ - bufctx.c \ - abi16.c \ - private.h - +libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES) libdrm_nouveauincludedir = ${includedir}/libdrm -libdrm_nouveauinclude_HEADERS = nouveau.h +libdrm_nouveauinclude_HEADERS = $(LIBDRM_NOUVEAU_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_nouveau.pc diff --git a/nouveau/Makefile.sources b/nouveau/Makefile.sources new file mode 100644 index 0000000..89f2a2b --- /dev/null +++ b/nouveau/Makefile.sources @@ -0,0 +1,9 @@ +LIBDRM_NOUVEAU_FILES := \ + nouveau.c \ + pushbuf.c \ + bufctx.c \ + abi16.c \ + private.h + +LIBDRM_NOUVEAU_H_FILES := \ + nouveau.h diff --git a/radeon/Makefile.am b/radeon/Makefile.am index c969573..aa66ca3 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -22,6 +22,8 @@ # Authors: # Jérôme Glisse +include Makefile.sources + AM_CFLAGS = \ $(WARN_CFLAGS) \ $(VISIBILITY_CFLAGS) \ @@ -35,26 +37,10 @@ libdrm_radeon_ladir = $(libdir) libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ - radeon_cs_gem.c \ - radeon_cs_space.c \ - radeon_bo.c \ - radeon_cs.c \ - radeon_surface.c \ - bof.c \ - bof.h +libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES) libdrm_radeonincludedir = ${includedir}/libdrm -libdrm_radeoninclude_HEADERS = \ - radeon_bo.h \ - radeon_cs.h \ - radeon_surface.h \ - radeon_bo_gem.h \ - radeon_cs_gem.h \ - radeon_bo_int.h \ - radeon_cs_int.h \ - r600_pci_ids.h +libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_radeon.pc diff --git a/radeon/Makefile.sources b/radeon/Makefile.sources new file mode 100644 index 0000000..a17701a --- /dev/null +++ b/radeon/Makefile.sources @@ -0,0 +1,19 @@ +LIBDRM_RADEON_FILES := \ + radeon_bo_gem.c \ + radeon_cs_gem.c \ + radeon_cs_space.c \ + radeon_bo.c \ + radeon_cs.c \ + radeon_surface.c \ + bof.c \ + bof.h + +LIBDRM_RADEON_H_FILES := \ + radeon_bo.h \ + radeon_cs.h \ + radeon_surface.h \ + radeon_bo_gem.h \ + radeon_cs_gem.h \ + radeon_bo_int.h \ + radeon_cs_int.h \ + r600_pci_ids.h