Update configure and Makefiles for the corrected name "interpreter".

[Faustine.git] / interpreter / Makefile

diff --git a/interpreter/Makefile b/interpreter/Makefile
index 715aadc..785feb6 100644 (file)
--- a/interpreter/Makefile
+++ b/interpreter/Makefile
@@ -27,7 +27,13 @@ PREPROCESSOR_PATH = $(FAUST_PATH)/compiler
 # Path to preprocessor header files
 PREPROCESSOR_INCLUDE_PATH = $(PREPROCESSOR_PATH)/headers
 
 # Path to preprocessor header files
 PREPROCESSOR_INCLUDE_PATH = $(PREPROCESSOR_PATH)/headers
 

-# Path to the interpretor documentation
+# Path to preprocessor cpp files
+PREPROCESSOR_SRC = $(wildcard $(PREPROCESSOR_PATH)/*/*.cpp) $(wildcard $(PREPROCESSOR_PATH)/draw/*/*.cpp)
+
+# Path to preprocessor obj files
+PREPROCESSOR_OBJ = $(PREPROCESSOR_SRC:.cpp=.o)
+
+# Path to the interpreter documentation

 OCAML_DOC_PATH = ../documentation
 
 ########################## Advanced user's variables #####################
 OCAML_DOC_PATH = ../documentation
 
 ########################## Advanced user's variables #####################


@@ -122,7 +128,8 @@ OPTOBJS = $(OBJS:.cmo=.cmx)
 
 CSOURCES = $(filter %.cpp, $(SOURCES))
 COBJS = $(CSOURCES:.cpp=.o)
 
 CSOURCES = $(filter %.cpp, $(SOURCES))
 COBJS = $(CSOURCES:.cpp=.o)

-CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+#CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+CLIBS = $(PREPROCESSOR_OBJ)

 
 PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))
 
 PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))