From patchwork Fri Sep 29 12:59:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9977999 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 70ED260311 for ; Fri, 29 Sep 2017 13:00:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 605E92986C for ; Fri, 29 Sep 2017 13:00:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C34D2986F; Fri, 29 Sep 2017 13:00:13 +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 BBF022987A for ; Fri, 29 Sep 2017 13:00:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C87296EBAF; Fri, 29 Sep 2017 13:00:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from johanna1.inet.fi (mta-out1.inet.fi [62.71.2.233]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FB336EBA1 for ; Fri, 29 Sep 2017 13:00:01 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 80 2014-11-10_18-01-23 260f8afb9361da3c7edfd3a8e3a4ca908191ad29 RazorGate-KAS: Lua profiles 69136 [Nov 12 2014] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.248.197.237) by johanna1.inet.fi (9.0.002.03-2-gbe5d057) id 59C24B1C00CC8E00; Fri, 29 Sep 2017 16:00:01 +0300 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1dxutd-0005Ml-Tu; Fri, 29 Sep 2017 16:00:01 +0300 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Fri, 29 Sep 2017 15:59:52 +0300 Message-Id: <1506689992-20540-8-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1506689992-20540-1-git-send-email-petri.latvala@intel.com> References: <1506689992-20540-1-git-send-email-petri.latvala@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 7/7] meson: Distribute meson build system files 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 Signed-off-by: Petri Latvala --- Makefile.am | 5 +++++ assembler/Makefile.am | 1 + benchmarks/Makefile.am | 5 ++++- lib/Makefile.am | 5 +++++ lib/tests/Makefile.am | 4 ++++ man/Makefile.am | 8 +++++++- overlay/Makefile.am | 5 ++++- tests/Makefile.am | 7 ++++++- tools/Makefile.am | 3 +++ tools/null_state_gen/Makefile.am | 4 ++++ 10 files changed, 43 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8c254027..eb5edb7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,3 +52,8 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST = \ + meson.build \ + meson.sh \ + $(NULL) diff --git a/assembler/Makefile.am b/assembler/Makefile.am index bed6c07c..855e33ab 100644 --- a/assembler/Makefile.am +++ b/assembler/Makefile.am @@ -153,6 +153,7 @@ CLEANFILES = $(BUILT_SOURCES) \ EXTRA_DIST = \ README \ TODO \ + meson.build \ intel-gen4asm.pc.in \ $(test_EXTRA_DIST) \ $(NULL) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 80c545ac..d066112a 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -23,4 +23,7 @@ gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_syslatency_LDADD = $(LDADD) -lpthread -lrt gem_wsim_LDADD = $(LDADD) -lpthread -EXTRA_DIST=README +EXTRA_DIST= \ + README \ + meson.build \ + $(NULL) diff --git a/lib/Makefile.am b/lib/Makefile.am index a17027b9..30ddb92b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -85,3 +85,8 @@ libintel_tools_la_LIBADD = \ $(GLIB_LIBS) \ -lm +EXTRA_DIST = \ + dummy.c \ + meson.build \ + version.h.in \ + $(NULL) diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 63bbbe59..3482dd44 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -19,3 +19,7 @@ LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS) $(T LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) + +EXTRA_DIST = \ + meson.build \ + $(NULL) diff --git a/man/Makefile.am b/man/Makefile.am index 0098fa45..777f5d1f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,7 +22,13 @@ if HAVE_RST2MAN appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX)) endif -EXTRA_DIST = $(appman_RST) +EXTRA_DIST = \ + $(appman_RST) \ + defs.rst.in \ + meson.build \ + rst2man.sh \ + $(NULL) + CLEANFILES = $(appman_DATA) defs.rst SUFFIXES = .$(APP_MAN_SUFFIX) diff --git a/overlay/Makefile.am b/overlay/Makefile.am index 5472514e..39fbcc4e 100644 --- a/overlay/Makefile.am +++ b/overlay/Makefile.am @@ -67,4 +67,7 @@ intel_gpu_overlay_SOURCES += $(both_x11_sources) intel_gpu_overlay_LDADD = $(LDADD) -lrt -EXTRA_DIST=README +EXTRA_DIST= \ + README \ + meson.build \ + $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1cea4036..89a97015 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -75,7 +75,12 @@ all-local: .gitignore @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@ EXTRA_PROGRAMS = $(HANG) -EXTRA_DIST = $(common_files) $(check_SCRIPTS) +EXTRA_DIST = \ + $(common_files) \ + $(check_SCRIPTS) \ + generate_testlist.sh \ + meson.build \ + $(NULL) CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore diff --git a/tools/Makefile.am b/tools/Makefile.am index 35732c17..a8196f07 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,3 +33,6 @@ intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl bin_SCRIPTS = intel_aubdump CLEANFILES = $(bin_SCRIPTS) +EXTRA_DIST = \ + meson.build \ + $(NULL) diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am index 24884a7f..2577dd88 100644 --- a/tools/null_state_gen/Makefile.am +++ b/tools/null_state_gen/Makefile.am @@ -28,3 +28,7 @@ states: intel_null_state_gen echo "" >>$(h); \ ./intel_null_state_gen $$gen >>$(h); \ done + +EXTRA_DIST = \ + meson.build \ + $(NULL)