Build system: fix for FlexLexer.h

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2954 ac1d8469-bf42-47a9-8791-bf33cf982152

Makefile.am

@@ -52,7 +52,8 @@ dynare_m_SOURCES = \
 	CodeInterpreter.hh \
 	FlexLexer.h
 
-dynare_m_CPPFLAGS = $(BOOST_CPPFLAGS)
+# The -I. is for <FlexLexer.h>
+dynare_m_CPPFLAGS = $(BOOST_CPPFLAGS) -I.
 dynare_m_LDFLAGS = $(BOOST_LDFLAGS)
 dynare_m_LDADD = macro/libmacro.a
 

ParsingDriver.hh

@@ -46,7 +46,7 @@ using namespace std;
 // Declare DynareFlexLexer class
 #ifndef __FLEX_LEXER_H
 # define yyFlexLexer DynareFlexLexer
-# include "FlexLexer.h"
+# include <FlexLexer.h>
 # undef yyFlexLexer
 #endif
 

macro/MacroDriver.hh

@@ -38,7 +38,7 @@ using namespace std;
 // Declare MacroFlexLexer class
 #ifndef __FLEX_LEXER_H
 # define yyFlexLexer MacroFlexLexer
-# include "../FlexLexer.h"
+# include <FlexLexer.h>
 # undef yyFlexLexer
 #endif
 

macro/Makefile.am

@@ -10,6 +10,9 @@ libmacro_a_SOURCES = \
 	MacroValue.cc \
 	MacroValue.hh
 
+# The -I.. is for <FlexLexer.h>
+libmacro_a_CPPFLAGS = -I..
+
 MacroFlex.cc: MacroFlex.ll
 	$(LEX) -oMacroFlex.cc MacroFlex.ll