From f7957284cb55007aa4be4152051c1c75b0a2c991 Mon Sep 17 00:00:00 2001
From: Daniel Galvez <dt.galvez@gmail.com>
Date: Sat, 12 Jan 2019 03:17:09 -0500
Subject: [PATCH 1/3] WIP: Try splitting two tasks to remove duplicated tasks.

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23507297413..d054ccfbe01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,9 @@ before_script:
   - ccache --zero-stats --max-size=3G
 
 env:
-  - CI_TARGETS="all ext"        # Job1: Build everything.
-  - CI_TARGETS="test"           # Job2: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
+  - CI_TARGETS="all"        # Job1: Build everything.
+  - CI_TARGETS="ext"        # Job2: Build everything.
+  - CI_TARGETS="test"       # Job3: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
 
 script:
   # See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html and
@@ -49,7 +50,7 @@ script:
   # for the explanation why extra switches needed for clang with ccache.
   - CXX="ccache clang++-3.8 -Qunused-arguments -fcolor-diagnostics -Wno-tautological-compare"
     CFLAGS=""
-    LDFLAGS="-llapack"
+    LDFLAGS="-llapack -Wl,-fuse-ld=gold"
     INCDIRS="$XROOT/usr/include"
     LIBDIRS="$XROOT/usr/lib"
       tools/extras/travis_script.sh

From 28708706bbdab7126538cbaf9a4194bfcc90bb6f Mon Sep 17 00:00:00 2001
From: Daniel Galvez <dt.galvez@gmail.com>
Date: Sun, 13 Jan 2019 16:25:42 -0500
Subject: [PATCH 2/3] Remove subprocess-based task serialization.

---
 .travis.yml  |  5 ++---
 src/Makefile | 13 +++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d054ccfbe01..1b8c5eae381 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,9 +40,8 @@ before_script:
   - ccache --zero-stats --max-size=3G
 
 env:
-  - CI_TARGETS="all"        # Job1: Build everything.
-  - CI_TARGETS="ext"        # Job2: Build everything.
-  - CI_TARGETS="test"       # Job3: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
+  - CI_TARGETS="all ext"    # Job1: Build everything.
+  - CI_TARGETS="test"       # Job2: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
 
 script:
   # See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html and
diff --git a/src/Makefile b/src/Makefile
index 1b37ebce745..a49c912c6ed 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,16 +31,9 @@ include kaldi.mk
 
 # Reset the default goal, so that the all target will become default
 .DEFAULT_GOAL :=
-all:
-	$(MAKE) checkversion
-	$(MAKE) kaldi.mk
-	$(MAKE) mklibdir
-	$(MAKE) subdirs
-	$(MAKE) -C matrix test
+all: $(SUBDIRS) matrix/test
 	-echo Done
 
-subdirs: $(SUBDIRS)
-
 mklibdir:
 	test -d $(KALDILIBDIR) || mkdir $(KALDILIBDIR)
 
@@ -139,11 +132,11 @@ ext_depend: check_portaudio
 
 
 .PHONY: $(SUBDIRS)
-$(SUBDIRS) : mklibdir
+$(SUBDIRS) : checkversion kaldi.mk mklibdir
 	$(MAKE) -C $@
 
 .PHONY: $(EXT_SUBDIRS)
-$(EXT_SUBDIRS) : mklibdir ext_depend
+$(EXT_SUBDIRS) : checkversion kaldi.mk mklibdir ext_depend
 	$(MAKE) -C $@
 
 

From b6d20422abbb41ca3f355d8a1eebe95cdd8547ba Mon Sep 17 00:00:00 2001
From: Daniel Galvez <dt.galvez@gmail.com>
Date: Sun, 13 Jan 2019 21:43:15 -0500
Subject: [PATCH 3/3] Whitespace fix.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b8c5eae381..51e49653efc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ before_script:
   - ccache --zero-stats --max-size=3G
 
 env:
-  - CI_TARGETS="all ext"    # Job1: Build everything.
-  - CI_TARGETS="test"       # Job2: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
+  - CI_TARGETS="all ext"        # Job1: Build everything.
+  - CI_TARGETS="test"           # Job2: Test libraries. #### ext_test? adds 5min compile, runs 1 test.
 
 script:
   # See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html and