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

[Faustine.git] / Makefile

diff --git a/Makefile b/Makefile
index 9bebbd3..2743a33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ arch   := $(wildcard architecture/*.*)
 all: $(EXEC)
 
 faustine:
 all: $(EXEC)
 
 faustine:

-       @cd $(SRC_DIR) && $(MAKE) opt      # using ocamlopt
-       @cd $(SRC_DIR) && $(MAKE) clean
+       $(MAKE) -C $(SRC_DIR) opt    # using ocamlopt compiler (optimized)

 
 .PHONY: clean mrproper test help install uninstall
 
 
 .PHONY: clean mrproper test help install uninstall
 


@@ -28,15 +27,16 @@ help :
        @echo "make dist : make a tar.gz file ready for distribution (TODO)"
 
 clean:
        @echo "make dist : make a tar.gz file ready for distribution (TODO)"
 
 clean:

-       @(cd $(SRC_DIR) && $(MAKE) clean)
+       @($(MAKE) -C $(SRC_DIR) clean)

        @(rm -f *~)
 
 mrproper: clean
        @(rm -f *~)
 
 mrproper: clean

-       @(cd $(SRC_DIR) && $(MAKE) mrproper)
-       @(cd $(PREPROCESSOR_DIR) && $(MAKE) clean)
+       @($(MAKE) -C $(SRC_DIR) mrproper)
+       @($(MAKE) -C $(PREPROCESSOR_DIR) clean)
+       @($(MAKE) -C $(EXAMPLES_DIR) clean)

 
 test:
 
 test:

-       @cd $(SINWAVE_DIR) && $(MAKE)
+       @$(MAKE) -C $(SINWAVE_DIR)

        @ls -l $(SINWAVE_DIR)/output1.wav
 
        @echo "    You might want to check the output file with either:"
        @ls -l $(SINWAVE_DIR)/output1.wav
 
        @echo "    You might want to check the output file with either:"


@@ -44,6 +44,9 @@ test:
        @echo "open $(SINWAVE_DIR)/output1.wav"
        @echo "octave -q --eval 'plot(wavread(\"$(SINWAVE_DIR)/output1.wav\")); pause'"
 
        @echo "open $(SINWAVE_DIR)/output1.wav"
        @echo "octave -q --eval 'plot(wavread(\"$(SINWAVE_DIR)/output1.wav\")); pause'"
 

+example:
+       @($(MAKE) -C $(EXAMPLES_DIR))
+

 install :
        mkdir -p $(prefix)/lib/faustine/
        mkdir -p $(prefix)/bin/
 install :
        mkdir -p $(prefix)/lib/faustine/
        mkdir -p $(prefix)/bin/