diff options
| author | Emil Velikov <[email protected]> | 2015-03-02 13:04:37 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-03-02 15:50:25 +0000 |
| commit | a0264d4076a12380320adfda3b5172de7b314e27 (patch) | |
| tree | 0e988a98988fff3b1a92bb613260568e5d7ef18a | |
| parent | c7d49878972ec4666d7287f7f8781bfdf2a65dd4 (diff) | |
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).
Cc: "10.4, 10.5" <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/mesa/Android.gen.mk | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 6 | ||||
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/main/formats.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index c7b7f7edf30..caae2c107a1 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 b6cb8f1117b..17697bf2187 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -80,7 +80,7 @@ EXTRA_DIST = \ BUILT_SOURCES = \ main/get_hash.h \ - main/format_info.c \ + main/format_info.h \ main/git_sha1.h \ main/format_pack.c \ main/format_unpack.c \ @@ -100,7 +100,7 @@ main/get_hash.h: ../mapi/glapi/gen/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 \ @@ -123,7 +123,7 @@ main/format_unpack.c: main/format_unpack.py main/formats.csv \ $(srcdir)/main/formats.csv \ | $(INDENT) $(INDENT_FLAGS) > $@; -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 1ad5f26d8bb..4d2ed622d4e 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/formats.c b/src/mesa/main/formats.c index 958d6f245ea..a5aa7939067 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -75,7 +75,7 @@ struct gl_format_info mesa_array_format ArrayFormat; }; -#include "format_info.c" +#include "format_info.h" static const struct gl_format_info * _mesa_get_format_info(mesa_format format) |