summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Marius Negreanu <adrian.m.negreanu@intel.com>2012-11-30 09:52:20 +0200
committerChad Versace <chad.versace@linux.intel.com>2012-12-03 12:12:28 -0800
commit409730843f48493690e2beb5ba2e036dbfdf378c (patch)
treef536545bc37750826fe90300a9666b8c4d4718f0
parenta4311054c78536acba0c3006c5d2805e182fa483 (diff)
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@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--src/mesa/program/Android.mk3
1 files changed, 0 insertions, 3 deletions
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)