From d6a658d27ada22781784b8e5e47947589c052583 Mon Sep 17 00:00:00 2001
From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Thu, 5 Sep 2013 17:43:57 +0200
Subject: [PATCH] Fix bugs in interpreter/Makefile.
---
interpretor/Makefile | 7 ++++---
interpretor/preprocessor/faust-0.9.47mr3/Makefile | 2 +-
interpretor/types.ml | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/interpretor/Makefile b/interpretor/Makefile
index 8576eda..3a35e1c 100644
--- 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 f184d25..943df95 100644
--- 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 3f0631b..f8aeeb8 100644
--- 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
--
2.20.1