android: fix bison warning of conflicting outputs to file
authorAdrian Marius Negreanu <adrian.m.negreanu@intel.com>
Fri, 30 Nov 2012 07:52:20 +0000 (09:52 +0200)
committerChad Versace <chad.versace@linux.intel.com>
Mon, 3 Dec 2012 20:12:28 +0000 (12:12 -0800)
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@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
src/mesa/program/Android.mk

index 5eb04395526ff32bd9a209203fcc758edc8a7016..712506129fdc69a376eb95c5391b61733912a650 100644 (file)
@@ -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)