From 6a9572fca95bae923fc8e233d9e83117578280d4 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Fri, 4 May 2012 02:36:29 +0000
Subject: [PATCH] fix mod_pocketsphinx build under make -j

---
 src/mod/asr_tts/mod_pocketsphinx/Makefile | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/mod/asr_tts/mod_pocketsphinx/Makefile b/src/mod/asr_tts/mod_pocketsphinx/Makefile
index c7269bd36d..9b2c6b28e4 100644
--- a/src/mod/asr_tts/mod_pocketsphinx/Makefile
+++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile
@@ -16,31 +16,39 @@ LOCAL_LIBADD=$(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
 BASE=../../../..
 include $(BASE)/build/modmake.rules
 
+mod_pocketsphinx.lo: $(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
+
 $(SPHINXBASE_DIR):
 	$(GETLIB) $(SPHINXBASE).tar.gz
 
-$(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_DIR)
+$(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR)
 	mkdir -p $(SPHINXBASE_BUILDDIR)
-	test -f $(SPHINXBASE_BUILDDIR)/Makefile || (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
-	test -f $(SPHINXBASE_BUILDDIR)/buildstamp || (touch $(SPHINXBASE_BUILDDIR)/buildstamp)
+	(cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
+	$(TOUCH_TARGET)
+
+$(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile
+	(cd $(SPHINXBASE_BUILDDIR) && $(MAKE))
+	touch $@
 
 $(SPHINXBASE_LA): $(SPHINXBASE_BUILDDIR)/buildstamp
-	cd $(SPHINXBASE_BUILDDIR) && $(MAKE)
+	$(TOUCH_TARGET)
+
+$(SPHINXBASE_LA2): $(SPHINXBASE_BUILDDIR)/buildstamp
 	$(TOUCH_TARGET)
 
 $(POCKETSPHINX_DIR):
 	$(GETLIB) $(POCKETSPHINX).tar.gz
 
-$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA)
+$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
 	mkdir -p $(POCKETSPHINX_BUILDDIR)
-	cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=
+	(cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=)
 	$(TOUCH_TARGET)
 
 $(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile
-	test -f $(POCKETSPHINX_BUILDDIR)/buildstamp || touch $(POCKETSPHINX_BUILDDIR)/buildstamp
+	(cd $(POCKETSPHINX_BUILDDIR) && $(MAKE))
+	touch $@
 
-$(POCKETSPHINX_LA): $(POCKETSPHINX_BUILDDIR)/Makefile 
-	cd $(POCKETSPHINX_BUILDDIR) && $(MAKE)
+$(POCKETSPHINX_LA): $(POCKETSPHINX_BUILDDIR)/buildstamp
 	$(TOUCH_TARGET)
 
 $(DESTDIR)$(grammardir)/model: