X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/8c48d01c4b78dba6159c13438b06cb7e07a1f338..9fdfd04e29fcefdb9120a4d9467827ceaf8dfaa0:/interpretor/Makefile

diff --git a/interpretor/Makefile b/interpretor/Makefile
index e287f8b..89cf5a7 100644
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@ -2,7 +2,7 @@
 #
 # The Caml sources (including camlyacc and camllex source files)
 
-SOURCES = types.ml parser.mly lexer.mll basic.ml symbol.ml aux.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
+SOURCES = types.ml parser.mly lexer.mll aux.ml basic.ml symbol.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
 
 # The executable file to generate
 
@@ -16,7 +16,7 @@ export OCAML_INCLUDE_PATH
 export SNDFILE_PATH
 
 # Path to Faust.mr2
-FAUST_PATH = faust-0.9.47mr3
+FAUST_PATH = preprocessor/faust-0.9.47mr3
 
 # Path to preprocessor library
 PREPROCESSOR_PATH = $(FAUST_PATH)/compiler
@@ -121,13 +121,14 @@ PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))
 MIDDLE_ML = $(PARSER_MLY:.mly=.ml) $(LEXER_MLL:.mll=.ml)
 
-preprocessor:
-	@(cd $(FAUST_PATH) && $(MAKE))
+preprocessor::
+	echo "Compling preprocessor..."
+	cd $(FAUST_PATH) && $(MAKE)
 
-$(EXEC): $(OBJS) $(COBJS)
+$(EXEC): $(OBJS) $(COBJS) $(CLIBS)
 	$(CAMLC) $(CAMLC_OPTIONS) -o $(EXEC) $(OBJS) $(COBJS) $(CLIBS)
 
-$(EXEC).opt: $(OPTOBJS) $(COBJS)
+$(EXEC).opt: $(OPTOBJS) $(COBJS) $(CLIBS)
 	$(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS)
 
 document: $(SMLYL) $(OBJS)