Mesa (master): android: fix bison warning of conflicting outputs to file

Chad Versace chadversary at kemper.freedesktop.org
Mon Dec 3 20:12:56 UTC 2012


Module: Mesa
Branch: master
Commit: 409730843f48493690e2beb5ba2e036dbfdf378c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=409730843f48493690e2beb5ba2e036dbfdf378c

Author: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>
Date:   Fri Nov 30 09:52:20 2012 +0200

android: fix bison warning of conflicting outputs to file

Bison -o parameter expects a .c file.
The corresponding .h filename is obtained
by removing the extension of the initial .c.

This was breaking compilation on Ubuntu 12.04

libmesa_dricore_intermediates/libmesa_dricore.a(program_parse.tab.o): In
function `_mesa_parse_arb_program':
external/mesa/src/mesa/program/program_parse.y:2682: multiple definition
of `_mesa_parse_arb_program'
libmesa_dricore_intermediates/libmesa_dricore.a(lex.yy.o):external/mesa/src/mesa/program/program_parse.y:2682:
first defined here

Signed-off-by: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-and-tested-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/mesa/program/Android.mk |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 5eb0439..7125061 100644
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -65,9 +65,6 @@ LOCAL_GENERATED_SOURCES := \
 $(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y
 	$(mesa_local-y-to-c-and-h)
 
-$(intermediates)/program/program_parse.tab.h: $(LOCAL_PATH)/program_parse.y
-	$(mesa_local-y-to-c-and-h)
-
 $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
 	$(local-l-to-c)
 




More information about the mesa-commit mailing list