From b1565e868d5549753fd710529b88bd4c183889ab Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 25 Jun 2012 09:09:14 +0200 Subject: zlib is now compiled as a dll --- tools/mhmake/src/mhmakeparser.y | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'tools/mhmake/src/mhmakeparser.y') diff --git a/tools/mhmake/src/mhmakeparser.y b/tools/mhmake/src/mhmakeparser.y index 847cda48a..d8edb1d51 100644 --- a/tools/mhmake/src/mhmakeparser.y +++ b/tools/mhmake/src/mhmakeparser.y @@ -53,7 +53,7 @@ const char Test[]="dit is een test"; %token COMMAND %token COMMA %token STRING DOLLAREXPR EQUAL COLON DOUBLECOLON VARDEF VARVAL -%token IMEQUAL PEQUAL OPTEQUAL PHONY AUTODEPS EXPORT NEWLINE INCLUDEMAK SPACE VPATH +%token IMEQUAL PEQUAL OPTEQUAL PHONY AUTODEPS EXPORT NEWLINE INCLUDEMAK SPACE VPATH ENVVARS_TOIGNORE %type expression nonspaceexpression simpleexpression %type maybeemptyexpression @@ -92,6 +92,7 @@ statement: NEWLINE | ruledef | phonyrule | autodepsrule | + envvarstoignorerule | varassignment | imvarassignment | pvarassignment | @@ -179,6 +180,26 @@ autodepsrule: AUTODEPS COLON expression NEWLINE ; +envvarstoignorerule: ENVVARS_TOIGNORE COLON expression + { + string VarsStr=m_pMakefile->ExpandExpression($3); + PRINTF(("Defining envvarstoignore rule : %s\n",$3.c_str())); + PRINTF((" Expanded to : %s\n",m_pMakefile->ExpandExpression($3).c_str())); + const char *pTmp=VarsStr.c_str(); + while (*pTmp) + { + string Var; + pTmp=NextItem(pTmp,Var); + if (!Var.empty()) + { // Add it to the list of env vars to ignore + m_pMakefile->m_EnvVarsToIgnore.insert(Var); + } + } + } + NEWLINE +; + + exportrule: EXPORT space exportstrings NEWLINE | EXPORT space STRING EQUAL maybeemptyexpression { -- cgit v1.2.3