From ca4f072da65d49b44c163f62289d0f828a3ad9d4 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Mon, 10 Dec 2012 17:40:31 +0000
Subject: [PATCH] Android.mk: fix the location of the espeak sources and
 exclude espeakedit from the build

---
 jni/Android.mk | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 1e378838..7d3e3255 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,13 +1,26 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-# eSpeak (minus command line apps)
+# eSpeak (minus command line apps and espeakedit)
 
 BLACKLIST_SRC_FILES := \
+  %/compiledata.cpp \
   %/espeak.cpp \
-  %/speak.cpp
+  %/espeakedit.cpp \
+  %/extras.cpp \
+  %/formantdlg.cpp \
+  %/menus.cpp \
+  %/options.cpp \
+  %/prosodydisplay.cpp \
+  %/speak.cpp \
+  %/spect.cpp \
+  %/spectdisplay.cpp \
+  %/spectseq.cpp \
+  %/transldlg.cpp \
+  %/voicedlg.cpp \
+  %/vowelchart.cpp
 
-ESPEAK_SRC_PATH := espeak-source/src
+ESPEAK_SRC_PATH := ../src
 
 ESPEAK_SRC_FILES := \
   $(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*))