diff options
| author | Rob Clark <robclark@freedesktop.org> | 2015-10-08 18:19:00 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2015-10-09 15:03:28 -0400 |
| commit | c9b982b72d443b138cfbded2f40350771c0bb321 (patch) | |
| tree | 77a24951da52105423bc6001a1dc5b75b6ee0485 /src/mesa/Makefile.sources | |
| parent | 7e441bf025cf8c5d088430d546acb4c0ed58d27b (diff) | |
| download | external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.tar.gz external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.tar.bz2 external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.zip | |
glsl: move shader_enums into nir
First step towards inverting the dependency between glsl and nir (so nir
can be used without glsl). Also solves this issue with 'make distclean'
Making distclean in mesa
make[2]: Entering directory '/mnt/sdb1/Src64/Mesa-git/mesa/src/mesa'
Makefile:2486: ../glsl/.deps/shader_enums.Plo: No such file or directory
make[2]: *** No rule to make target '../glsl/.deps/shader_enums.Plo'. Stop.
make[2]: Leaving directory '/mnt/sdb1/Src64/Mesa-git/mesa/src/mesa'
Makefile:684: recipe for target 'distclean-recursive' failed
make[1]: *** [distclean-recursive] Error 1
make[1]: Leaving directory '/mnt/sdb1/Src64/Mesa-git/mesa/src'
Makefile:615: recipe for target 'distclean-recursive' failed
make: *** [distclean-recursive] Error 1
Reported-by: Andy Furniss <adf.lists@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/mesa/Makefile.sources')
| -rw-r--r-- | src/mesa/Makefile.sources | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 0915594cea..b40ee4d395 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -525,9 +525,7 @@ PROGRAM_FILES = \ program/sampler.h \ program/string_to_uint_map.cpp \ program/symbol_table.c \ - program/symbol_table.h \ - ../glsl/shader_enums.c \ - ../glsl/shader_enums.h + program/symbol_table.h PROGRAM_NIR_FILES = \ program/prog_to_nir.c \ |