From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Mon, 16 Sep 2013 17:00:29 +0000 (+0200)
Subject: Update configure and Makefiles for the corrected name "interpreter".
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/77b9c8773c1b1a6f7731d4b5d4f6fa50446869b5?ds=sidebyside

Update configure and Makefiles for the corrected name "interpreter".
Success in test: ./configure + make + sudo make install + make test + make example.
---

diff --git a/Makefile b/Makefile
index 2743a33..c8c0630 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Faustine top-level Makefile.
 
 EXEC = faustine
-SRC_DIR = interpretor
+SRC_DIR = interpreter
 PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
 EXAMPLES_DIR = examples
 SINWAVE_DIR = $(EXAMPLES_DIR)/sinwave
@@ -50,7 +50,7 @@ example:
 install :
 	mkdir -p $(prefix)/lib/faustine/
 	mkdir -p $(prefix)/bin/
-	install interpretor/faustine $(prefix)/bin/
+	install $(SRC_DIR)/faustine $(prefix)/bin/
 	install -m 0644 $(arch) $(prefix)/lib/faustine/
 
 uninstall :
diff --git a/README.txt b/README.txt
index 0598180..49e9cd3 100644
--- a/README.txt
+++ b/README.txt
@@ -30,7 +30,7 @@ CONTENTS
   configure             compilation configuration script
   examples/             vector examples (fft, image processingÉ)
   INSTALL.txt           Faustine installation instructions
-  interpretor/          Faustine's interpretor source code
+  interpreter/          Faustine's interpreter source code
   LICENSE.txt           license and copyright notice
   Makefile              main Makefile to compile and install
   README.txt            this file
diff --git a/architecture/morpho.lib b/architecture/morpho.lib
index f81afd6..5c42861 100644
--- a/architecture/morpho.lib
+++ b/architecture/morpho.lib
@@ -62,6 +62,6 @@ licenceplate(x, y, o1, c2, t3, t4, t5, t6, o7, o8, d9, d10) = _ <: (opening_line
 //process = erosions(8, 8, 3);
 //process = open(8, 8, 2);
 //process = close(8, 8, 5);
-process = licenceplate(4, 4, 15, 8, 1, 50, 150, 255, 4, 4, 2, 20);
+//process = licenceplate(4, 4, 15, 8, 1, 50, 150, 255, 4, 4, 2, 20);
 
 
diff --git a/configure b/configure
index ebb3976..da51248 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 
 # libsndfile configure
 
-LIBSNDFILE_PREFIX=$PWD/interpretor/lib
+LIBSNDFILE_PREFIX=$PWD/interpreter/lib
 LIBSNDFILE_SRCDIR=$LIBSNDFILE_PREFIX/src/libsndfile-1.0.25
 LIBSNDFILE_DESTNAME=libsndfile
 DESTDIR=$LIBSNDFILE_PREFIX/$LIBSNDFILE_DESTNAME
diff --git a/examples/Makefile b/examples/Makefile
index 30cc6fa..7163a89 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -8,3 +8,4 @@ examples::
 
 clean::
 	@$(foreach example, $(EXAMPLES), $(MAKE) -C $(example) clean;)
+	rm -f */*~
diff --git a/interpreter/Makefile b/interpreter/Makefile
index 715aadc..785feb6 100644
--- a/interpreter/Makefile
+++ b/interpreter/Makefile
@@ -27,7 +27,13 @@ PREPROCESSOR_PATH = $(FAUST_PATH)/compiler
 # Path to preprocessor header files
 PREPROCESSOR_INCLUDE_PATH = $(PREPROCESSOR_PATH)/headers
 
-# Path to the interpretor documentation
+# Path to preprocessor cpp files
+PREPROCESSOR_SRC = $(wildcard $(PREPROCESSOR_PATH)/*/*.cpp) $(wildcard $(PREPROCESSOR_PATH)/draw/*/*.cpp)
+
+# Path to preprocessor obj files
+PREPROCESSOR_OBJ = $(PREPROCESSOR_SRC:.cpp=.o)
+
+# Path to the interpreter documentation
 OCAML_DOC_PATH = ../documentation
 
 ########################## Advanced user's variables #####################
@@ -122,7 +128,8 @@ OPTOBJS = $(OBJS:.cmo=.cmx)
 
 CSOURCES = $(filter %.cpp, $(SOURCES))
 COBJS = $(CSOURCES:.cpp=.o)
-CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+#CLIBS = $(PREPROCESSOR_PATH)/preprocess.a
+CLIBS = $(PREPROCESSOR_OBJ)
 
 PARSER_MLY = $(filter %.mly, $(SOURCES))
 LEXER_MLL = $(filter %.mll, $(SOURCES))
diff --git a/interpreter/preprocessor/faust-0.9.47mr3/compiler/Makefile b/interpreter/preprocessor/faust-0.9.47mr3/compiler/Makefile
index 02ac902..36665bf 100755
--- a/interpreter/preprocessor/faust-0.9.47mr3/compiler/Makefile
+++ b/interpreter/preprocessor/faust-0.9.47mr3/compiler/Makefile
@@ -23,7 +23,7 @@ endif
 CXXFLAGS ?= -O3 -Wall -Wuninitialized $(ARCHFLAGS)
 CXXFLAGS += -Wno-parentheses $(addprefix -I, $(subprojects)) -DINSTALL_PREFIX='"$(prefix)"'
 
-all : faust preprocess.a # Haisheng WANG adds preprocess.a for multirate faust interpretor
+all : faust preprocess.a # Haisheng WANG adds preprocess.a for multirate faust interpreter
 
 faust : $(objects)
 	$(CXX) $(CXXFLAGS) $(objects) -o faust