Nested vectors are implemented, including parser and class nstio.

[Faustine.git] / Makefile

diff --git a/Makefile b/Makefile
index c558b8c..582ead6 100644 (file)
--- 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,24 @@ clean:
 mrproper: clean
        @($(MAKE) -C $(SRC_DIR) mrproper)
        @($(MAKE) -C $(PREPROCESSOR_DIR) clean)
+       @($(MAKE) -C $(EXAMPLES_DIR) clean)
 
 test:
        @$(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/