Merge branch 'libsndfile'

[Faustine.git] / interpretor / Makefile

diff --git a/interpretor/Makefile b/interpretor/Makefile
index 4a5f84f..f8ea173 100644 (file)
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@ -4,7 +4,7 @@
 #
 # The Caml sources (including camlyacc and camllex source files)
 
 #
 # The Caml sources (including camlyacc and camllex source files)
 

-SOURCES = types.ml parser.mly lexer.mll basic.ml symbol.ml aux.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
+SOURCES = types.ml parser.mly lexer.mll aux.ml basic.ml symbol.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp

 
 # The executable file to generate
 EXEC = faustine
 
 # The executable file to generate
 EXEC = faustine


@@ -13,7 +13,7 @@ EXEC = faustine
 OCAML_INCLUDE_PATH := $(subst bin,lib,$(shell which ocaml))
 
 # Path to sndfile library
 OCAML_INCLUDE_PATH := $(subst bin,lib,$(shell which ocaml))
 
 # Path to sndfile library

-SNDFILE_PATH := lib/libsndfile
+SNDFILE_PATH := lib/src/libsndfile-ocaml

 
 # Path to Faust.mr3
 FAUST_PATH = preprocessor/faust-0.9.47mr3
 
 # Path to Faust.mr3
 FAUST_PATH = preprocessor/faust-0.9.47mr3


@@ -54,6 +54,7 @@ LIBS = $(WITHSNDFILE) $(WITHUNIX) $(WITHSTR)
 # INCLUDE=-INCLUDE
 
 INCLUDE = -I $(SNDFILE_PATH)
 # INCLUDE=-INCLUDE
 
 INCLUDE = -I $(SNDFILE_PATH)

+SNDFILE_STUB := $(SNDFILE_PATH)/sndfile_stub.o

 
 # Default setting of the WITH* variables. Should be changed if your
 # local libraries are not found by the compiler.
 
 # Default setting of the WITH* variables. Should be changed if your
 # local libraries are not found by the compiler.


@@ -128,10 +129,12 @@ preprocessor::
 
 $(EXEC): $(OBJS) $(COBJS) $(CLIBS)
        @echo "Compiling $(EXEC)..."
 
 $(EXEC): $(OBJS) $(COBJS) $(CLIBS)
        @echo "Compiling $(EXEC)..."

+       cp $(SNDFILE_STUB) .

        $(CAMLC) $(CAMLC_OPTIONS) -o $(EXEC) $(OBJS) $(COBJS) $(CLIBS)
 
 $(EXEC).opt: $(OPTOBJS) $(COBJS) $(CLIBS)
        @echo "Compiling optimized $(EXEC)..."
        $(CAMLC) $(CAMLC_OPTIONS) -o $(EXEC) $(OBJS) $(COBJS) $(CLIBS)
 
 $(EXEC).opt: $(OPTOBJS) $(COBJS) $(CLIBS)
        @echo "Compiling optimized $(EXEC)..."

+       cp $(SNDFILE_STUB) .

        $(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS)
 
 document: $(SMLYL) $(OBJS)
        $(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS)
 
 document: $(SMLYL) $(OBJS)