From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Thu, 12 Sep 2013 12:19:32 +0000 (+0200)
Subject: Merge branch 'libsndfile'
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/63cf293f572ae7d5c1c83b9dffb31e7d774f8854?ds=inline;hp=-c

Merge branch 'libsndfile'
---

63cf293f572ae7d5c1c83b9dffb31e7d774f8854
diff --combined interpretor/Makefile
index 89cf5a7,30a10c9..f8ea173
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@@ -1,21 -1,21 +1,21 @@@
+ # Faustine interpreter Makefile.
+ 
  ########################## User's variables #####################
  #
  # 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
  
  # Path to ocaml include header files
- export OCAML_INCLUDE_PATH
+ OCAML_INCLUDE_PATH := $(subst bin,lib,$(shell which ocaml))
  
  # Path to sndfile library
- #SNDFILE_PATH = /home/wang/Desktop/libsndfile-ocaml
- export SNDFILE_PATH
+ SNDFILE_PATH := lib/src/libsndfile-ocaml
  
- # Path to Faust.mr2
+ # Path to Faust.mr3
  FAUST_PATH = preprocessor/faust-0.9.47mr3
  
  # Path to preprocessor library
@@@ -54,6 -54,7 +54,7 @@@ LIBS = $(WITHSNDFILE) $(WITHUNIX) $(WIT
  # 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.
@@@ -84,6 -85,7 +85,7 @@@ CAMLC_OPTIONS = $(GPP_CALL) $(INCLUDE) 
  CAMLOPT_OPTIONS = -p $(GPP_CALL) $(INCLUDE) $(LIBS:.cma=.cmxa) 
  
  CAMLDOC_OPTIONS = -d $(OCAML_DOC_PATH) -html $(INCLUDE)
+ 
  CC_OPTIONS = -c -I$(PREPROCESSOR_INCLUDE_PATH) -I$(OCAML_INCLUDE_PATH)
  
  ################ End of user's variables #####################
@@@ -122,16 -124,21 +124,21 @@@ LEXER_MLL = $(filter %.mll, $(SOURCES)
  MIDDLE_ML = $(PARSER_MLY:.mly=.ml) $(LEXER_MLL:.mll=.ml)
  
  preprocessor::
- 	echo "Compling preprocessor..."
+ 	@echo "Compiling preprocessor..."
  	cd $(FAUST_PATH) && $(MAKE)
  
  $(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)..."
+ 	cp $(SNDFILE_STUB) .
  	$(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS)
  
  document: $(SMLYL) $(OBJS)
+ 	@echo "Compiling documentation..."
  	$(CAMLDOC) $(CAMLDOC_OPTIONS) $(SMLYL)
  
  main.cmo: main.ml