| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Thu, 10 Jul 2014 14:48:12 +0200 |
| 4 | Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 8 | --- |
| 9 | src/fpglsl/Makefile.am | 3 ++- |
| 10 | src/glsl/Makefile.am | 3 ++- |
| 11 | src/perf/Makefile.am | 3 ++- |
| 12 | src/vpglsl/Makefile.am | 3 ++- |
| 13 | 4 files changed, 8 insertions(+), 4 deletions(-) |
| 14 | |
| 15 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am |
| 16 | index fd43c91..2bf51de 100644 |
| 17 | --- a/src/fpglsl/Makefile.am |
| 18 | +++ b/src/fpglsl/Makefile.am |
| 19 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ |
| 20 | fp-tri |
| 21 | endif |
| 22 | |
| 23 | -EXTRA_DIST = \ |
| 24 | +demosdatadir=$(datadir)/$(PACKAGE)/ |
| 25 | +dist_demosdata_DATA= \ |
| 26 | depth-read.glsl \ |
| 27 | dowhile2.glsl \ |
| 28 | dowhile.glsl \ |
| 29 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am |
| 30 | index 079a29d..f66ec29 100644 |
| 31 | --- a/src/glsl/Makefile.am |
| 32 | +++ b/src/glsl/Makefile.am |
| 33 | @@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la |
| 34 | vert_tex_LDADD = ../util/libutil.la |
| 35 | vsraytrace_LDADD = ../util/libutil.la |
| 36 | |
| 37 | -EXTRA_DIST = \ |
| 38 | +demosdatadir=$(datadir)/$(PACKAGE)/ |
| 39 | +dist_demosdata_DATA= \ |
| 40 | CH06-brick.frag \ |
| 41 | CH06-brick.vert \ |
| 42 | CH11-bumpmap.frag \ |
| 43 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am |
| 44 | index c5cca8d..140256d 100644 |
| 45 | --- a/src/perf/Makefile.am |
| 46 | +++ b/src/perf/Makefile.am |
| 47 | @@ -58,7 +58,8 @@ endif |
| 48 | |
| 49 | glslstateschange_LDADD = libperf.la ../util/libutil.la |
| 50 | |
| 51 | -EXTRA_DIST = \ |
| 52 | +demosdatadir=$(datadir)/$(PACKAGE)/ |
| 53 | +dist_demosdata_DATA= \ |
| 54 | glslstateschange1.frag \ |
| 55 | glslstateschange1.vert \ |
| 56 | glslstateschange2.frag \ |
| 57 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am |
| 58 | index 48b08f4..5526867 100644 |
| 59 | --- a/src/vpglsl/Makefile.am |
| 60 | +++ b/src/vpglsl/Makefile.am |
| 61 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ |
| 62 | vp-tris |
| 63 | endif |
| 64 | |
| 65 | -EXTRA_DIST = \ |
| 66 | +demosdatadir=$(datadir)/$(PACKAGE)/ |
| 67 | +dist_demosdata_DATA= \ |
| 68 | for.glsl \ |
| 69 | func.glsl \ |
| 70 | func2.glsl \ |
| 71 | -- |
| 72 | 2.0.0 |
| 73 | |