diff --git a/.travis.yml b/.travis.yml
index 23507297413..51e49653efc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,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
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 $@