From 5a54fa6e45ee10cf58ee1b6d2eb5522a24bb8745 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 12 Sep 2013 11:38:41 +0200 Subject: Some minor modifications Ignore pipe symbols when in dependency list Solved some linking problems in linux Solved problem calling svn info when using svn version from cygwin --- tools/mhmake/src/mhmakeparser.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/mhmake/src/mhmakeparser.y') diff --git a/tools/mhmake/src/mhmakeparser.y b/tools/mhmake/src/mhmakeparser.y index d8edb1d51..f9042f780 100644 --- a/tools/mhmake/src/mhmakeparser.y +++ b/tools/mhmake/src/mhmakeparser.y @@ -52,7 +52,7 @@ const char Test[]="dit is een test"; %token END 0 "end of file" %token COMMAND %token COMMA -%token STRING DOLLAREXPR EQUAL COLON DOUBLECOLON VARDEF VARVAL +%token STRING DOLLAREXPR PIPE EQUAL COLON DOUBLECOLON VARDEF VARVAL %token IMEQUAL PEQUAL OPTEQUAL PHONY AUTODEPS EXPORT NEWLINE INCLUDEMAK SPACE VPATH ENVVARS_TOIGNORE %type expression nonspaceexpression simpleexpression @@ -136,8 +136,8 @@ ruledef: expression_nocolorequal rulecolon maybeemptyexpression throw string("Empty left hand side in rule: ") + $1 + " : " + $3; } #endif - m_pMakefile->SplitToItems(m_pMakefile->ExpandExpression($1),*m_pMakefile->m_pCurrentItems); - m_pMakefile->SplitToItems(m_pMakefile->ExpandExpression($3),*m_pMakefile->m_pCurrentDeps); + m_pMakefile->SplitToItems(m_pMakefile->ExpandExpression($1), *m_pMakefile->m_pCurrentItems); + m_pMakefile->SplitToItems(m_pMakefile->ExpandExpression($3), *m_pMakefile->m_pCurrentDeps); m_pMakefile->m_DoubleColonRule= ($2==1) ; PRINTF(("Defining rule %s : %s\n",$1.c_str(),$3.c_str())); PRINTF((" Expanded to %s : %s\n",m_pMakefile->ExpandExpression($1).c_str(),m_pMakefile->ExpandExpression($3).c_str())); @@ -286,6 +286,7 @@ nonspaceexpression_nocolorequal: simpleexpression_nocolorequal | ; simpleexpression: simpleexpression_nocolorequal | + PIPE | EQUAL | COLON | DOUBLECOLON | -- cgit v1.2.3