1 From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001
2 From: Martin Jansa <Martin.Jansa@gmail.com>
3 Date: Thu, 10 Jul 2014 14:29:27 +0200
4 Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to
7 Upstream-Status: Pending
9 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 src/fpglsl/Makefile.am | 2 ++
13 src/glsl/Makefile.am | 10 ++++++++--
14 src/perf/Makefile.am | 6 ++++++
15 src/vpglsl/Makefile.am | 1 +
16 4 files changed, 17 insertions(+), 2 deletions(-)
18 diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
19 index 47c1039f..fd43c919 100644
20 --- a/src/fpglsl/Makefile.am
21 +++ b/src/fpglsl/Makefile.am
22 @@ -39,10 +39,12 @@ noinst_PROGRAMS = \
31 + infinite-loop.glsl \
35 diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
36 index 4faa8dbf..079a29d8 100644
37 --- a/src/glsl/Makefile.am
38 +++ b/src/glsl/Makefile.am
39 @@ -37,7 +37,7 @@ AM_LDFLAGS = \
48 @@ -123,12 +123,16 @@ EXTRA_DIST = \
52 + CH11-bumpmaptex.frag \
60 + blinking-teapot.frag \
61 + blinking-teapot.vert \
66 @@ -138,5 +142,7 @@ EXTRA_DIST = \
70 + simplex-noise.glsl \
74 diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
75 index f0031fea..60069396 100644
76 --- a/src/perf/Makefile.am
77 +++ b/src/perf/Makefile.am
78 @@ -59,3 +59,9 @@ endif
80 glslstateschange_LDADD = libperf.la ../util/libutil.la
81 glsl_compile_time_LDADD = ../util/libutil.la
84 + glslstateschange1.frag \
85 + glslstateschange1.vert \
86 + glslstateschange2.frag \
87 + glslstateschange2.vert
88 diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
89 index 4a85ed40..48b08f48 100644
90 --- a/src/vpglsl/Makefile.am
91 +++ b/src/vpglsl/Makefile.am
92 @@ -44,6 +44,7 @@ EXTRA_DIST = \
96 + infinite-loop.glsl \