[LON-CAPA-cvs] cvs: capa /capa51/pProj Makefile

[raeburn]

raeburn		Tue May 11 01:38:41 2010 EDT

  Modified files:              
    /capa/capa51/pProj	Makefile 
  Log:
  - Include -y option when calling bison so token definitions are included
    in header files: capaToken.h and capaFormula.h (in CAPA/pProj) created by bison.
    - This prevents errors when compiling capaFormulaLexer.c on distros
      using bison 2.4.1.  
  
  
Index: capa/capa51/pProj/Makefile
diff -u capa/capa51/pProj/Makefile:1.22 capa/capa51/pProj/Makefile:1.23
--- capa/capa51/pProj/Makefile:1.22	Thu Jun 30 15:33:09 2005
+++ capa/capa51/pProj/Makefile	Tue May 11 01:38:41 2010
@@ -149,22 +149,22 @@
 	$(CC) $(CFLAG) $(DEF) -o $@ $(ARCH)/convert.o -L$(ARCH) -lcapa$(VER) $(P_FLAGS)
 
 capaToken.h: capaGrammarDef.y
-	$(YACC) -d $< --output=capaParserFun.c
+	$(YACC) -y -d $< --output=capaParserFun.c
 	mv capaParserFun.h capaToken.h
 
 capaForumla.h: capaFormula.y
-	$(YACC) -d $< -p fml_ --output=$@
+	$(YACC) -y -d $< -p fml_ --output=$@
 	mv capaFormulaParser.h capaFormula.h
 
 capaParserFun.c: capaGrammarDef.y
-	$(YACC) -d $< --output=$@
+	$(YACC) -y -d $< --output=$@
 	mv capaParserFun.h capaToken.h
 
 capaLexerFun.c: capaLexerDef.flex capaToken.h
 	$(LEX) -o$@ $<
 
 capaFormulaParser.c: capaFormula.y
-	$(YACC) -d $< -p fml_ --output=$@
+	$(YACC) -y -d $< -p fml_ --output=$@
 	mv capaFormulaParser.h capaFormula.h
 
 clean: