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

[Faustine.git] / Makefile

diff --git a/Makefile b/Makefile
index 79e54a51fa4ad4f913fce3d6ca362897abdf503b..c8c0630585e49792991f7aa6be887e12a2fa879e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 # Faustine top-level Makefile.
 
 EXEC = faustine
 # Faustine top-level Makefile.
 
 EXEC = faustine

-SRC_DIR = interpretor
+SRC_DIR = interpreter

 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3

-OUTPUTSOUNDS_DIR = examples/output_sounds
+EXAMPLES_DIR = examples
+SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave

 
 DESTDIR ?= 
 PREFIX ?= /usr/local
 
 DESTDIR ?= 
 PREFIX ?= /usr/local


@@ -13,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
 


@@ -27,27 +27,30 @@ 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: # TODO, obsolete
-       @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav
-       @cd $(SRC_DIR) && ./faustine -d ../dsp_files/sin.dsp
-       @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav
+test:
+       @$(MAKE) -C $(SINWAVE_DIR)
+       @ls -l $(SINWAVE_DIR)/output1.wav

 
        @echo "    You might want to check the output file with either:"
 
        @echo "    You might want to check the output file with either:"

-       @echo "audacity ../examples/output_sounds/output0.wav"
-       @echo "open ../examples/output_sounds/output0.wav"
-       @echo "octave -q --eval 'plot(wavread(\"../examples/output_sounds/output0.wav\")); pause'"
+       @echo "audacity $(SINWAVE_DIR)/output1.wav"
+       @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/

-       install interpretor/faustine $(prefix)/bin/
+       install $(SRC_DIR)/faustine $(prefix)/bin/

        install -m 0644 $(arch) $(prefix)/lib/faustine/
 
 uninstall :
        install -m 0644 $(arch) $(prefix)/lib/faustine/
 
 uninstall :