diff options
author | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
commit | bd13c464f728719fceb8a4918b52727ec125ea6e (patch) | |
tree | 05a48375076036097a9e28356738c05a16cc5ed0 /mesalib/src/mesa/Android.gen.mk | |
parent | bab6395ded69210cbc550c0fb3765160e4405283 (diff) | |
parent | 0130346adbce7e6b2422429887fc46c76806d845 (diff) | |
download | vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2 vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'mesalib/src/mesa/Android.gen.mk')
-rw-r--r-- | mesalib/src/mesa/Android.gen.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk index f5e63234a..c17df1a1e 100644 --- a/mesalib/src/mesa/Android.gen.mk +++ b/mesalib/src/mesa/Android.gen.mk @@ -75,10 +75,10 @@ define local-l-to-c $(hide) $(LEX) -o$@ $< endef -define local-y-to-c-and-h +define mesa_local-y-to-c-and-h @mkdir -p $(dir $@) @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ $< + $(hide) $(YACC) -o $@ -p "_mesa_program_" $< endef define es-gen @@ -104,7 +104,7 @@ $(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps) $(call es-gen, -c $*) $(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y - $(local-y-to-c-and-h) + $(mesa_local-y-to-c-and-h) $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l $(local-l-to-c) |