X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/dbded051d69cc5ba556884eb285feba032e09d29..4745d0cba82b458d491320c72e564b23899a5310:/Makefile

diff --git a/Makefile b/Makefile
index c558b8c..e1b6ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Faustine top-level Makefile.
 
 EXEC = faustine
-SRC_DIR = interpretor
+SRC_DIR = interpreter
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 EXAMPLES_DIR = examples
 SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave
@@ -9,7 +9,7 @@ SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave
 DESTDIR ?= 
 PREFIX ?= /usr/local
 prefix := $(DESTDIR)$(PREFIX)
-arch   := $(wildcard architecture/*.*)
+lib    := $(wildcard lib/*.*)
 
 all: $(EXEC)
 
@@ -33,21 +33,25 @@ clean:
 mrproper: clean
 	@($(MAKE) -C $(SRC_DIR) mrproper)
 	@($(MAKE) -C $(PREPROCESSOR_DIR) clean)
+	@($(MAKE) -C $(EXAMPLES_DIR) clean)
 
 test:
+	@$(MAKE) -C $(SINWAVE_DIR) clean
 	@$(MAKE) -C $(SINWAVE_DIR)
-	@ls -l $(SINWAVE_DIR)/output1.wav
 
 	@echo "    You might want to check the output file with either:"
-	@echo "audacity $(SINWAVE_DIR)/output1.wav"
-	@echo "open $(SINWAVE_DIR)/output1.wav"
-	@echo "octave -q --eval 'plot(wavread(\"$(SINWAVE_DIR)/output1.wav\")); pause'"
+	@echo "audacity $(SINWAVE_DIR)/sin.wav"
+	@echo "open $(SINWAVE_DIR)/sin.wav"
+	@echo "octave -q --eval 'plot(wavread(\"$(SINWAVE_DIR)/sin.wav\")); pause'"
+
+examples::
+	@($(MAKE) -C $(EXAMPLES_DIR))
 
 install :
 	mkdir -p $(prefix)/lib/faustine/
 	mkdir -p $(prefix)/bin/
-	install interpretor/faustine $(prefix)/bin/
-	install -m 0644 $(arch) $(prefix)/lib/faustine/
+	install $(SRC_DIR)/faustine $(prefix)/bin/
+	install -m 0644 $(lib) $(prefix)/lib/faustine/
 
 uninstall :
 	rm -rf $(prefix)/lib/faustine/