Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / interpretor / Makefile

diff --git a/interpretor/Makefile b/interpretor/Makefile
index d7ec8b7..715aadc 100644 (file)
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@ -130,11 +130,11 @@ MIDDLE_ML = $(PARSER_MLY:.mly=.ml) $(LEXER_MLL:.mll=.ml)
 
 preprocessor::
        @echo "Compiling preprocessor..."
 
 preprocessor::
        @echo "Compiling preprocessor..."

-       cd $(FAUST_PATH) && $(MAKE)
+       $(MAKE) -C $(FAUST_PATH) preprocessor

 
 libsndfile-ocaml::
        @echo "Compiling libsndfile-ocaml..."
 
 libsndfile-ocaml::
        @echo "Compiling libsndfile-ocaml..."

-       cd $(SNDFILE_PATH) && $(MAKE)
+       $(MAKE) -C $(SNDFILE_PATH)

 
 
 $(EXEC): $(OBJS) $(COBJS) $(CLIBS)
 
 
 $(EXEC): $(OBJS) $(COBJS) $(CLIBS)


@@ -213,12 +213,12 @@ faustio.cmx: faustio.ml
 
 clean::
        rm -f *.cm[iox] *~ .*~
 
 clean::
        rm -f *.cm[iox] *~ .*~

-       rm -f $(MIDDLE_ML) *.o $(MLIS) .depend*
-       @cd $(SNDFILE_PATH) && $(MAKE) clean
+       rm -f $(MIDDLE_ML) *.o $(MLIS) # .depend*
+       @$(MAKE) -C $(SNDFILE_PATH) clean

 
 mrproper: clean
 
 mrproper: clean

-       @cd $(SNDFILE_PATH) && $(MAKE) mrproper
-       rm -f $(EXEC)*
+       @$(MAKE) -C $(SNDFILE_PATH) mrproper
+       rm -f $(EXEC)* .depend*

 
 .depend.input: Makefile
        @echo -n '--Checking Ocaml input files: '
 
 .depend.input: Makefile
        @echo -n '--Checking Ocaml input files: '