New Makefile for libsndfile-ocaml library integration; Makefiles chain modified.

[Faustine.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 972de0f..b370540 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,20 +1,21 @@
+# Faustine top-level Makefile.
+
+EXEC = faustine

 SRC_DIR = interpretor
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 OUTPUTSOUNDS_DIR = examples/output_sounds
 SRC_DIR = interpretor
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 OUTPUTSOUNDS_DIR = examples/output_sounds

-EXEC = faustine

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

-CROSS=i586-mingw32msvc-
-

 prefix := $(DESTDIR)$(PREFIX)
 arch   := $(wildcard architecture/*.*)
 
 all: $(EXEC)
 
 faustine:
 prefix := $(DESTDIR)$(PREFIX)
 arch   := $(wildcard architecture/*.*)
 
 all: $(EXEC)
 
 faustine:

-       @cp $(SNDFILE_PATH)/sndfile_stub.o $(SRC_DIR)
-       @cd $(SRC_DIR) && $(MAKE) opt OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH)
+#      @cp $(SNDFILE_PATH)/sndfile_stub.o $(SRC_DIR)
+## Using ocamlopt with 'make opt'
+       @cd $(SRC_DIR) && $(MAKE) opt #OCAML_INCLUDE_PATH=$(OCAML_INCLUDE_PATH) SNDFILE_PATH=$(SNDFILE_PATH)

        @cd $(SRC_DIR) && $(MAKE) clean
 
 .PHONY: clean mrproper test help install uninstall
        @cd $(SRC_DIR) && $(MAKE) clean
 
 .PHONY: clean mrproper test help install uninstall


@@ -35,7 +36,7 @@ mrproper: clean
        @(cd $(SRC_DIR) && $(MAKE) mrproper)
        @(cd $(PREPROCESSOR_DIR) && $(MAKE) clean)
 
        @(cd $(SRC_DIR) && $(MAKE) mrproper)
        @(cd $(PREPROCESSOR_DIR) && $(MAKE) clean)
 

-test: 
+test: # TODO, obsolete

        @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav
        @cd $(SRC_DIR) && ./faustine -d ../dsp_files/sin.dsp
        @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav
        @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav
        @cd $(SRC_DIR) && ./faustine -d ../dsp_files/sin.dsp
        @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav


@@ -54,8 +55,3 @@ install :
 uninstall :
        rm -rf $(prefix)/lib/faustine/
        rm -f $(prefix)/bin/faustine
 uninstall :
        rm -rf $(prefix)/lib/faustine/
        rm -f $(prefix)/bin/faustine

-
-
-# Library paths for OCaml and libsndfile-ocaml
-# OCAML_INCLUDE_PATH
-# SNDFILE_PATH