From 409730843f48493690e2beb5ba2e036dbfdf378c Mon Sep 17 00:00:00 2001 From: Adrian Marius Negreanu Date: Fri, 30 Nov 2012 09:52:20 +0200 Subject: android: fix bison warning of conflicting outputs to file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tapani Pälli Reviewed-and-tested-by: Chad Versace --- src/mesa/program/Android.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/mesa/program/Android.mk') diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index 5eb04395526..712506129fd 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) -- cgit v1.2.3