norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix out-of-tree build and distcheck

Browse Source 
The paths can be off when building out of tree, so have make put them in
for us instead. This requires turning the straight genshader.c file to a
template.

Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
Ran Benita 2012-01-27 12:04:51 +02:00 committed by David Herrmann
parent 510e53376a
commit 647d666da3
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ stamp-*
.libs
genshader
src/output_shaders.c
src/genshader.c

2
Makefile.am
View File

@ -26,7 +26,7 @@ EXTRA_DIST += src/output_shader_def.vert src/output_shader_def.frag \
src/output_shader_tex.vert src/output_shader_tex.frag
CLEANFILES += src/output_shaders.c
genshader_SOURCES = \
nodist_genshader_SOURCES = \
src/genshader.c
src/output_shaders.c: src/output_shader_def.vert src/output_shader_def.frag \

1
configure.ac
View File

@ -119,4 +119,5 @@ if test ! x$debug = xyes ; then
fi
AC_CONFIG_FILES([Makefile])
AC_OUTPUT([src/genshader.c])
AC_OUTPUT

12
src/genshader.c → src/genshader.c.in
View File

@ -132,13 +132,13 @@ int main(int argc, char *argv[])
char *def_vert, *def_frag, *tex_vert, *tex_frag;
size_t vs, fs, tvs, tfs;
def_vert = read_file("./src/output_shader_def.vert", &vs);
def_frag = read_file("./src/output_shader_def.frag", &fs);
tex_vert = read_file("./src/output_shader_tex.vert", &tvs);
tex_frag = read_file("./src/output_shader_tex.frag", &tfs);
def_vert = read_file("@abs_srcdir@/output_shader_def.vert", &vs);
def_frag = read_file("@abs_srcdir@/output_shader_def.frag", &fs);
tex_vert = read_file("@abs_srcdir@/output_shader_tex.vert", &tvs);
tex_frag = read_file("@abs_srcdir@/output_shader_tex.frag", &tfs);
write_file("./src/output_shaders.c", def_vert, vs, def_frag, fs,
tex_vert, tvs, tex_frag, tfs);
write_file("@abs_builddir@/output_shaders.c", def_vert, vs,
def_frag, fs, tex_vert, tvs, tex_frag, tfs);
free(tex_vert);
free(tex_frag);