diff --git a/projects/usrpe31x/Makefile b/projects/usrpe31x/Makefile
index 620ee8f00..7e38ae702 100644
--- a/projects/usrpe31x/Makefile
+++ b/projects/usrpe31x/Makefile
@@ -5,17 +5,65 @@
 ####################################################################################
 ####################################################################################
 
-.PHONY: all clean clean-all 
-all:
-	-make -C system_project.tcl all
+M_DEPS += system_top.v
+M_DEPS += system_project.tcl
+M_DEPS += system_constr.xdc
+M_DEPS += system_bd.tcl
+M_DEPS += ../scripts/adi_project.tcl
+M_DEPS += ../scripts/adi_env.tcl
+M_DEPS += ../scripts/adi_board.tcl
+M_DEPS += ../../library/xilinx/common/ad_iobuf.v
+M_DEPS += ../../library/axi_ad9361/axi_ad9361.xpr
+M_DEPS += ../../library/axi_dmac/axi_dmac.xpr
+M_DEPS += ../../library/util_cpack/util_cpack.xpr
+M_DEPS += ../../library/util_tdd_sync/util_tdd_sync.xpr
+M_DEPS += ../../library/util_upack/util_upack.xpr
+
+M_VIVADO := vivado -mode batch -source
+
+M_FLIST := *.cache
+M_FLIST += *.data
+M_FLIST += *.xpr
+M_FLIST += *.log
+M_FLIST += *.jou
+M_FLIST +=  xgui
+M_FLIST += *.runs
+M_FLIST += *.srcs
+M_FLIST += *.sdk
+M_FLIST += *.hw
+M_FLIST += *.sim
+M_FLIST += .Xil
+M_FLIST += *.ip_user_files
+
+
+
+.PHONY: all lib clean clean-all
+all: lib usrpe31x.sdk/system_top.hdf
 
 
 clean: 
-	make -C system_project.tcl clean
+	rm -rf $(M_FLIST)
 
 
-clean-all:
-	make -C system_project.tcl clean-all
+clean-all:clean
+	make -C ../../library/axi_ad9361 clean
+	make -C ../../library/axi_dmac clean
+	make -C ../../library/util_cpack clean
+	make -C ../../library/util_tdd_sync clean
+	make -C ../../library/util_upack clean
+
+
+usrpe31x.sdk/system_top.hdf: $(M_DEPS)
+	-rm -rf $(M_FLIST)
+	$(M_VIVADO) system_project.tcl >> usrpe31x_vivado.log 2>&1
+
+
+lib:
+	make -C ../../library/axi_ad9361
+	make -C ../../library/axi_dmac
+	make -C ../../library/util_cpack
+	make -C ../../library/util_tdd_sync
+	make -C ../../library/util_upack
 
 ####################################################################################
 ####################################################################################