[Freeswitch-svn] [commit] r8965 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx

[Freeswitch SVN]

Author: brian
Date: Wed Jul  9 16:30:08 2008
New Revision: 8965

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c

Log:
update build system for pocketsphinx

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile	Wed Jul  9 16:30:08 2008
@@ -1,4 +1,40 @@
-LOCAL_CFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --cflags pocketsphinx sphinxbase`
-LOCAL_LDFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --libs pocketsphinx sphinxbase`
+SPHINXBASE=sphinxbase-0.4
+SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE)
+POCKETSPHINX=pocketsphinx-0.5
+POCKETSPHINX_DIR=$(switch_srcdir)/libs/$(POCKETSPHINX)
+SPHINXBASE_LA=$(SPHINXBASE_DIR)/src/libsphinxbase/libsphinxbase.la
+SPHINXBASE_LA2=$(SPHINXBASE_DIR)/src/libsphinxad/libsphinxad.la
+
+POCKETSPHINX_LA=$(POCKETSPHINX_DIR)/src/libpocketsphinx/libpocketsphinx.la
+
+SPHINXMODEL=communicator_semi_6000_20080321
+
+LOCAL_CFLAGS=-I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include
+LOCAL_LIBADD=$(SPHINXBASE_LA) $(SPHINXBASE_LA2) $(POCKETSPHINX_LA) 
 BASE=../../../..
 include $(BASE)/build/modmake.rules
+
+$(SPHINXBASE_DIR):
+	$(GETLIB) $(SPHINXBASE).tar.gz
+
+$(SPHINXBASE_DIR)/buildstamp: $(SPHINXBASE_DIR)
+	test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && ./configure --with-pic --without-python --disable-shared)
+	test -f $(SPHINXBASE_DIR)/buildstamp || (touch $(SPHINXBASE_DIR)/buildstamp)
+
+$(SPHINXBASE_LA): $(SPHINXBASE_DIR)/buildstamp
+	cd $(SPHINXBASE_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
+
+$(POCKETSPHINX_DIR):
+	$(GETLIB) $(POCKETSPHINX).tar.gz
+
+$(POCKETSPHINX_DIR)/Makefile: $(POCKETSPHINX_DIR)
+	cd $(POCKETSPHINX_DIR) && ./configure --with-pic --without-python --disable-shared --with-sphinxbase=$(SPHINXBASE_DIR)
+	$(TOUCH_TARGET)
+
+$(POCKETSPHINX_DIR)/buildstamp: $(POCKETSPHINX_DIR)/Makefile
+	test -f $(POCKETSPHINX_DIR)/buildstamp || touch $(POCKETSPHINX_DIR)/buildstamp
+
+$(POCKETSPHINX_LA): $(POCKETSPHINX_DIR)/Makefile 
+	cd $(POCKETSPHINX_DIR) && $(MAKE)
+	$(TOUCH_TARGET)

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	Wed Jul  9 16:30:08 2008
@@ -32,7 +32,7 @@
 
 #include <switch.h>
 #include <pocketsphinx.h>
-#include <sphinxbase/err.h>
+#include <err.h>
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown);