Fix bugs in interpreter/Makefile.

diff --git a/interpretor/Makefile b/interpretor/Makefile
index 8576eda014df77259926e7f4c3a626a40f1398a1..3a35e1ce59c9a6f73793f4c497fbf4f8f9284d56 100644 (file)
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@ -121,15 +121,16 @@ PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))
 MIDDLE_ML = $(PARSER_MLY:.mly=.ml) $(LEXER_MLL:.mll=.ml)
 
+preprocessor::
+       echo "Compling preprocessor..."
+       cd $(FAUST_PATH) && $(MAKE)
+
 $(EXEC): $(OBJS) $(COBJS) $(CLIBS)
        $(CAMLC) $(CAMLC_OPTIONS) -o $(EXEC) $(OBJS) $(COBJS) $(CLIBS)
 
 $(EXEC).opt: $(OPTOBJS) $(COBJS) $(CLIBS)
        $(CAMLOPT) $(CAMLOPT_OPTIONS) -o $(EXEC) $(OPTOBJS) $(COBJS) $(CLIBS)
 
-$(CLIBS):
-       @(cd $(FAUST_PATH) && $(MAKE))
-
 document: $(SMLYL) $(OBJS)
        $(CAMLDOC) $(CAMLDOC_OPTIONS) $(SMLYL)
 

diff --git a/interpretor/preprocessor/faust-0.9.47mr3/Makefile b/interpretor/preprocessor/faust-0.9.47mr3/Makefile
index f184d25327964bcfdc2e82ca68ac77af0369e031..943df95b354643740739d07b5bb0abdc8b050252 100644 (file)
--- a/interpretor/preprocessor/faust-0.9.47mr3/Makefile
+++ b/interpretor/preprocessor/faust-0.9.47mr3/Makefile
@@ -1,4 +1,4 @@
-version := 0.9.47mr2
+version := 0.9.47mr3
 
 DESTDIR ?= 
 PREFIX ?= /usr/local

diff --git a/interpretor/types.ml b/interpretor/types.ml
index 3f0631b447444d0154a4a3a689d5b5ac15ff4019..f8aeeb86d08118b76902ef275dd38ea83bbc72fe 100644 (file)
--- a/interpretor/types.ml
+++ b/interpretor/types.ml
@@ -98,7 +98,7 @@ class type rate_type =
 
 class type signal_type = 
     object
-      method frequency : rate_type
+      method frequency : int
       method at : time -> value_type
       method add_memory : int -> unit
       method add : signal_type -> signal_type