Module: Mesa Branch: 10.4 Commit: 97b0219ed5a61b4935794e76c40ccea9250ebadf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97b0219ed5a61b4935794e76c40ccea9250ebadf
Author: Emil Velikov <[email protected]> Date: Mon Mar 2 15:58:17 2015 +0000 mesa: rename format_info.c to format_info.h The file is auto-generated, and #included by formats.c. Let's rename it to reflect the latter. This will also help up fix the dependency tracking by adding it to the _SOURCES variable, without the side effect of it being compiled (twice). v2: Update .gitignore to reflect the rename. Cc: "10.4, 10.5" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]> (cherry picked from commit 3f6c28f2a976e35128b7a4a513cfa60af00301e1) Conflicts: src/mesa/Makefile.am src/mesa/main/.gitignore --- src/mesa/Android.gen.mk | 2 +- src/mesa/Makefile.am | 6 +++--- src/mesa/SConscript | 2 +- src/mesa/main/.gitignore | 2 +- src/mesa/main/formats.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index c7b7f7e..caae2c1 100644 --- a/src/mesa/Android.gen.mk +++ b/src/mesa/Android.gen.mk @@ -122,5 +122,5 @@ format_info_deps := \ $(LOCAL_PATH)/main/format_parser.py \ $(FORMAT_INFO) -$(intermediates)/main/format_info.c: $(format_info_deps) +$(intermediates)/main/format_info.h: $(format_info_deps) @$(MESA_PYTHON2) $(FORMAT_INFO) $< > $@ diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 3b68573..90b7c94 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -64,7 +64,7 @@ include Makefile.sources BUILT_SOURCES = \ main/get_hash.h \ - main/format_info.c \ + main/format_info.h \ $(BUILDDIR)main/git_sha1.h \ $(BUILDDIR)program/program_parse.tab.c \ $(BUILDDIR)program/lex.yy.c @@ -82,14 +82,14 @@ main/get_hash.h: $(GLAPI)/gl_and_es_API.xml main/get_hash_params.py \ -f $< > [email protected]; \ mv [email protected] $@; -main/format_info.c: main/formats.csv \ +main/format_info.h: main/formats.csv \ main/format_parser.py main/format_info.py $(AM_V_GEN)set -e; \ $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/format_info.py \ $< > [email protected]; \ mv [email protected] $@; -main/formats.c: main/format_info.c +main/formats.c: main/format_info.h noinst_LTLIBRARIES = $(ARCH_LIBS) if NEED_LIBMESA diff --git a/src/mesa/SConscript b/src/mesa/SConscript index e7c4f5c..1017034 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -60,7 +60,7 @@ get_hash_header = env.CodeGenerate( ) format_info = env.CodeGenerate( - target = 'main/format_info.c', + target = 'main/format_info.h', script = 'main/format_info.py', source = 'main/formats.csv', command = python_cmd + ' $SCRIPT ' + ' $SOURCE > $TARGET' diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore index fec0629..c74f58a 100644 --- a/src/mesa/main/.gitignore +++ b/src/mesa/main/.gitignore @@ -8,4 +8,4 @@ git_sha1.h.tmp remap_helper.h get_hash.h get_hash.h.tmp -format_info.c +format_info.h diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 58c32e2..c6c5680 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -73,7 +73,7 @@ struct gl_format_info uint8_t Swizzle[4]; }; -#include "format_info.c" +#include "format_info.h" static const struct gl_format_info * _mesa_get_format_info(mesa_format format) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
