From d1c6d254e19ec31b501bd70f0a3adcc824ad8e56 Mon Sep 17 00:00:00 2001 From: cloudygoose Date: Thu, 25 Jun 2015 20:29:52 +0800 Subject: make clean added --- Makefile | 4 +++- nerv/Makefile | 4 ++-- speech | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bfcd56f..cc0c32e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean install luajit luarocks speech SHELL := /bin/bash PREFIX := $(CURDIR)/install/ -all: luajit luarocks +all: luajit luarocks install luajit: PREFIX=$(PREFIX) ./tools/build_luajit.sh luarocks: @@ -10,3 +10,5 @@ install: cd nerv; $(PREFIX)/bin/luarocks make speech: cd speech/htk_io; $(PREFIX)/bin/luarocks make +clean: + rm -r $(CURDIR)/install diff --git a/nerv/Makefile b/nerv/Makefile index 224cc8a..7b75522 100644 --- a/nerv/Makefile +++ b/nerv/Makefile @@ -36,8 +36,8 @@ LUA_LIBS := matrix/init.lua io/init.lua init.lua \ io/sgd_buffer.lua INCLUDE := -I $(LUA_INCDIR) -DLUA_USE_APICHECK -#CUDA_BASE := /usr/local/cuda-6.5 -CUDA_BASE := /usr/local/cuda-5.0 +CUDA_BASE := /usr/local/cuda-6.5 +#CUDA_BASE := /usr/local/cuda-5.0 CUDA_INCLUDE := -I $(CUDA_BASE)/include/ INCLUDE += $(CUDA_INCLUDE) diff --git a/speech b/speech index 08e33af..32eac09 160000 --- a/speech +++ b/speech @@ -1 +1 @@ -Subproject commit 08e33afa533af1f026ac271446a0c873fe0bb5cb +Subproject commit 32eac093cc431849a92e5a2297c5fe646fd60556 -- cgit v1.2.3