1*4882a593SmuzhiyunFrom 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Martin Jansa <Martin.Jansa@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 10 Jul 2014 14:48:12 +0200 4*4882a593SmuzhiyunSubject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Pending 7*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun src/fpglsl/Makefile.am | 3 ++- 11*4882a593Smuzhiyun src/glsl/Makefile.am | 3 ++- 12*4882a593Smuzhiyun src/perf/Makefile.am | 3 ++- 13*4882a593Smuzhiyun src/vpglsl/Makefile.am | 3 ++- 14*4882a593Smuzhiyun 4 files changed, 8 insertions(+), 4 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am 17*4882a593Smuzhiyunindex fd43c919..2bf51de4 100644 18*4882a593Smuzhiyun--- a/src/fpglsl/Makefile.am 19*4882a593Smuzhiyun+++ b/src/fpglsl/Makefile.am 20*4882a593Smuzhiyun@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ 21*4882a593Smuzhiyun fp-tri 22*4882a593Smuzhiyun endif 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun-EXTRA_DIST = \ 25*4882a593Smuzhiyun+demosdatadir=$(datadir)/$(PACKAGE)/ 26*4882a593Smuzhiyun+dist_demosdata_DATA= \ 27*4882a593Smuzhiyun depth-read.glsl \ 28*4882a593Smuzhiyun dowhile2.glsl \ 29*4882a593Smuzhiyun dowhile.glsl \ 30*4882a593Smuzhiyundiff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am 31*4882a593Smuzhiyunindex 079a29d8..f66ec299 100644 32*4882a593Smuzhiyun--- a/src/glsl/Makefile.am 33*4882a593Smuzhiyun+++ b/src/glsl/Makefile.am 34*4882a593Smuzhiyun@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la 35*4882a593Smuzhiyun vert_tex_LDADD = ../util/libutil.la 36*4882a593Smuzhiyun vsraytrace_LDADD = ../util/libutil.la 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun-EXTRA_DIST = \ 39*4882a593Smuzhiyun+demosdatadir=$(datadir)/$(PACKAGE)/ 40*4882a593Smuzhiyun+dist_demosdata_DATA= \ 41*4882a593Smuzhiyun CH06-brick.frag \ 42*4882a593Smuzhiyun CH06-brick.vert \ 43*4882a593Smuzhiyun CH11-bumpmap.frag \ 44*4882a593Smuzhiyundiff --git a/src/perf/Makefile.am b/src/perf/Makefile.am 45*4882a593Smuzhiyunindex 60069396..469bdf45 100644 46*4882a593Smuzhiyun--- a/src/perf/Makefile.am 47*4882a593Smuzhiyun+++ b/src/perf/Makefile.am 48*4882a593Smuzhiyun@@ -60,7 +60,8 @@ endif 49*4882a593Smuzhiyun glslstateschange_LDADD = libperf.la ../util/libutil.la 50*4882a593Smuzhiyun glsl_compile_time_LDADD = ../util/libutil.la 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun-EXTRA_DIST = \ 53*4882a593Smuzhiyun+demosdatadir=$(datadir)/$(PACKAGE)/ 54*4882a593Smuzhiyun+dist_demosdata_DATA= \ 55*4882a593Smuzhiyun glslstateschange1.frag \ 56*4882a593Smuzhiyun glslstateschange1.vert \ 57*4882a593Smuzhiyun glslstateschange2.frag \ 58*4882a593Smuzhiyundiff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am 59*4882a593Smuzhiyunindex 48b08f48..55268675 100644 60*4882a593Smuzhiyun--- a/src/vpglsl/Makefile.am 61*4882a593Smuzhiyun+++ b/src/vpglsl/Makefile.am 62*4882a593Smuzhiyun@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ 63*4882a593Smuzhiyun vp-tris 64*4882a593Smuzhiyun endif 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun-EXTRA_DIST = \ 67*4882a593Smuzhiyun+demosdatadir=$(datadir)/$(PACKAGE)/ 68*4882a593Smuzhiyun+dist_demosdata_DATA= \ 69*4882a593Smuzhiyun for.glsl \ 70*4882a593Smuzhiyun func.glsl \ 71*4882a593Smuzhiyun func2.glsl \ 72