From: Adrian Marius Negreanu <adrian.m.negre...@intel.com>

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.negre...@intel.com>
---
 src/mesa/program/Android.mk | 3 ---
 1 file changed, 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)
 
-- 
1.8.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to