trunk: merging changes from sandbox/bolt into tools/; change in sctk version (note: does not fix the problem reported on the list.)

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4353 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

tools/Makefile

@@ -26,17 +26,18 @@ irstlm_cleaned:
 	$(MAKE) -C irstlm clean 
 
 sclite_cleaned:
-	$(MAKE) -C sctk-2.4.0 clean
+	$(MAKE) -C sctk clean
 
 distclean:
 	rm -rf openfst-1.3.4/
-	rm -rf sctk-2.4.0/
+	rm -rf sctk-2.4.8/
+	rm -rf sctk
 	rm -rf ATLAS/
 	rm -rf irstlm/
 	rm -rf sph2pipe_v2.5/
 	rm -rf sph2pipe_v2.5.tar.gz
 	rm -rf atlas3.8.3.tar.gz
-	rm -rf sctk-2.4.0-20091110-0958.tar.bz2
+	rm -rf sctk-2.4.8-20130429-2145.tar.bz2
 	rm -rf openfst-1.3.4.tar.gz
 	rm -f openfst
 
@@ -82,20 +83,23 @@ openfst-1.3.4.tar.gz:
 sclite: sclite_compiled
 
 .PHONY: sclite_compiled
-sclite_compiled: sctk_patched
-	cd sctk-2.4.0; \
-	patch -p0 -N < ../sctk.patch; \
-	{ . ../extras/install_sctk_patched.sh; } && $(MAKE) config && $(MAKE) all && $(MAKE) install && $(MAKE) doc
+sclite_compiled: sctk_configured
+	cd sctk; \
+	$(MAKE) all && $(MAKE) install && $(MAKE) doc
 
-.PHONY: sctk_patched
-sctk_patched: | sctk-2.4.0
-	cd sctk-2.4.0/; \
-	for x in src/asclite/core/recording.h src/asclite/core/recording.cpp; do \
-		sed 's/Filter::Filter/::Filter/' $$x > tmpf; mv tmpf $$x; \
-	done;
+sctk_configured:sctk/.configured
 
-sctk-2.4.0: sctk-2.4.0-20091110-0958.tar.bz2
-	tar xojf sctk-2.4.0-20091110-0958.tar.bz2
+sctk/.configured:sctk
+	cd sctk; $(MAKE) config
+	touch sctk/.configured
+
+.PHONY: sctk
+sctk: sctk-2.4.8-20130429-2145.tar.bz2
+	tar xojf sctk-2.4.8-20130429-2145.tar.bz2
+	rm -rf sctk && ln -s sctk-2.4.8 sctk
+
+sctk-2.4.8-20130429-2145.tar.bz2:
+	wget -T 10 -t 3 ftp://jaguar.ncsl.nist.gov/pub/sctk-2.4.8-20130429-2145.tar.bz2
 
 sctk-2.4.0-20091110-0958.tar.bz2:
 	wget -T 10 -t 3 ftp://jaguar.ncsl.nist.gov/pub/sctk-2.4.0-20091110-0958.tar.bz2 || \