diff --git a/preprocessor/include/BlockTriangular.hh b/preprocessor/BlockTriangular.hh similarity index 100% rename from preprocessor/include/BlockTriangular.hh rename to preprocessor/BlockTriangular.hh diff --git a/preprocessor/include/CodeInterpreter.hh b/preprocessor/CodeInterpreter.hh similarity index 100% rename from preprocessor/include/CodeInterpreter.hh rename to preprocessor/CodeInterpreter.hh diff --git a/preprocessor/include/ComputingTasks.hh b/preprocessor/ComputingTasks.hh similarity index 100% rename from preprocessor/include/ComputingTasks.hh rename to preprocessor/ComputingTasks.hh diff --git a/preprocessor/include/DataTree.hh b/preprocessor/DataTree.hh similarity index 100% rename from preprocessor/include/DataTree.hh rename to preprocessor/DataTree.hh diff --git a/preprocessor/include/ExprNode.hh b/preprocessor/ExprNode.hh similarity index 100% rename from preprocessor/include/ExprNode.hh rename to preprocessor/ExprNode.hh diff --git a/preprocessor/include/IncidenceMatrix.hh b/preprocessor/IncidenceMatrix.hh similarity index 100% rename from preprocessor/include/IncidenceMatrix.hh rename to preprocessor/IncidenceMatrix.hh diff --git a/preprocessor/Makefile b/preprocessor/Makefile index 7b4477c91beecc23b401d400237a193c02f8c409..501bdf9e63196707c1a04de84c32171517003e45 100644 --- a/preprocessor/Makefile +++ b/preprocessor/Makefile @@ -65,8 +65,6 @@ MACRO_OBJS = \ macro/MacroDriver.o \ macro/MacroValue.o -$(MAIN_OBJS) $(MAIN_OBJS:.o=.d): CPPFLAGS = -Iinclude - # Build rules @@ -83,9 +81,8 @@ $(DYNARE_M): $(MAIN_OBJS) $(MACRO_OBJS) DynareFlex.cc: DynareFlex.ll flex -oDynareFlex.cc DynareFlex.ll -DynareBison.cc include/DynareBison.hh include/location.hh include/stack.hh include/position.hh: DynareBison.yy +DynareBison.cc DynareBison.hh location.hh stack.hh position.hh: DynareBison.yy bison --verbose -o DynareBison.cc DynareBison.yy - mv DynareBison.hh location.hh stack.hh position.hh include/ macro/MacroFlex.cc: macro/MacroFlex.ll cd macro && flex -oMacroFlex.cc MacroFlex.ll @@ -105,8 +102,7 @@ macro/MacroBison.cc macro/MacroBison.hh macro/location.hh macro/stack.hh macro/p sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ rm -f $@.$$$$ -# These files are included in the .d files without their path, so we force them -vpath DynareBison.hh include +# As DynareBison.hh, this file is included in the .d files without its path (since it is generated), so we force the path vpath MacroBison.hh macro -include $(MAIN_OBJS:.o=.d) @@ -117,15 +113,14 @@ vpath MacroBison.hh macro .PHONY: clean clean: - rm -f *.o *.d \ - *~ include/*~ \ + rm -f *.o *.d *~ \ DynareFlex.cc \ DynareBison.output \ DynareBison.cc \ - include/position.hh \ - include/stack.hh \ - include/location.hh \ - include/DynareBison.hh \ + position.hh \ + stack.hh \ + location.hh \ + DynareBison.hh \ $(DYNARE_M) cd macro && rm -f *.o *.d *~ \ MacroFlex.cc \ diff --git a/preprocessor/include/MatlabFile.hh b/preprocessor/MatlabFile.hh similarity index 100% rename from preprocessor/include/MatlabFile.hh rename to preprocessor/MatlabFile.hh diff --git a/preprocessor/include/ModFile.hh b/preprocessor/ModFile.hh similarity index 100% rename from preprocessor/include/ModFile.hh rename to preprocessor/ModFile.hh diff --git a/preprocessor/include/ModelBlocks.hh b/preprocessor/ModelBlocks.hh similarity index 100% rename from preprocessor/include/ModelBlocks.hh rename to preprocessor/ModelBlocks.hh diff --git a/preprocessor/include/ModelNormalization.hh b/preprocessor/ModelNormalization.hh similarity index 100% rename from preprocessor/include/ModelNormalization.hh rename to preprocessor/ModelNormalization.hh diff --git a/preprocessor/include/ModelTree.hh b/preprocessor/ModelTree.hh similarity index 100% rename from preprocessor/include/ModelTree.hh rename to preprocessor/ModelTree.hh diff --git a/preprocessor/include/Model_Graph.hh b/preprocessor/Model_Graph.hh similarity index 100% rename from preprocessor/include/Model_Graph.hh rename to preprocessor/Model_Graph.hh diff --git a/preprocessor/include/NumericalConstants.hh b/preprocessor/NumericalConstants.hh similarity index 100% rename from preprocessor/include/NumericalConstants.hh rename to preprocessor/NumericalConstants.hh diff --git a/preprocessor/include/NumericalInitialization.hh b/preprocessor/NumericalInitialization.hh similarity index 100% rename from preprocessor/include/NumericalInitialization.hh rename to preprocessor/NumericalInitialization.hh diff --git a/preprocessor/include/ParsingDriver.hh b/preprocessor/ParsingDriver.hh similarity index 100% rename from preprocessor/include/ParsingDriver.hh rename to preprocessor/ParsingDriver.hh diff --git a/preprocessor/include/Shocks.hh b/preprocessor/Shocks.hh similarity index 100% rename from preprocessor/include/Shocks.hh rename to preprocessor/Shocks.hh diff --git a/preprocessor/include/SigmaeInitialization.hh b/preprocessor/SigmaeInitialization.hh similarity index 100% rename from preprocessor/include/SigmaeInitialization.hh rename to preprocessor/SigmaeInitialization.hh diff --git a/preprocessor/include/Statement.hh b/preprocessor/Statement.hh similarity index 100% rename from preprocessor/include/Statement.hh rename to preprocessor/Statement.hh diff --git a/preprocessor/include/SymbolList.hh b/preprocessor/SymbolList.hh similarity index 100% rename from preprocessor/include/SymbolList.hh rename to preprocessor/SymbolList.hh diff --git a/preprocessor/include/SymbolTable.hh b/preprocessor/SymbolTable.hh similarity index 100% rename from preprocessor/include/SymbolTable.hh rename to preprocessor/SymbolTable.hh diff --git a/preprocessor/include/VariableTable.hh b/preprocessor/VariableTable.hh similarity index 100% rename from preprocessor/include/VariableTable.hh rename to preprocessor/VariableTable.hh