Stdin, stdout and stderr updated, tested.

[Faustine.git] / Makefile

diff --git a/Makefile b/Makefile
index 9bebbd3..5f8cbba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # 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
 EXAMPLES_DIR = examples
 SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 EXAMPLES_DIR = examples
 SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave


@@ -9,13 +9,12 @@ SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave
 DESTDIR ?= 
 PREFIX ?= /usr/local
 prefix := $(DESTDIR)$(PREFIX)
 DESTDIR ?= 
 PREFIX ?= /usr/local
 prefix := $(DESTDIR)$(PREFIX)

-arch   := $(wildcard architecture/*.*)
+lib    := $(wildcard lib/*.*)

 
 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,11 +44,14 @@ 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'"
 

+examples::
+       @($(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 -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/
 
 uninstall :
        rm -rf $(prefix)/lib/faustine/