X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/63cf293f572ae7d5c1c83b9dffb31e7d774f8854..e8e5ebaac3fd20af4989400e61811dc59ccbc6b8:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 79e54a5..c558b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@
 EXEC = faustine
 SRC_DIR = interpretor
 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
@@ -13,8 +14,7 @@ arch   := $(wildcard architecture/*.*)
 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
 
@@ -27,22 +27,21 @@ help :
 	@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
-	@(cd $(SRC_DIR) && $(MAKE) mrproper)
-	@(cd $(PREPROCESSOR_DIR) && $(MAKE) clean)
+	@($(MAKE) -C $(SRC_DIR) mrproper)
+	@($(MAKE) -C $(PREPROCESSOR_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 "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'"
 
 install :
 	mkdir -p $(prefix)/lib/faustine/