diff options
| author | Matt Ettus <matt@ettus.com> | 2010-06-08 10:36:04 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-06-08 10:36:04 -0700 |
| commit | 6eb6050269f469b982843b526eff80b37e8c5f3b (patch) | |
| tree | b9d4d06ab221f168d0e36512acd9bf285f04ad5a /usrp2/top | |
| parent | 552b06b5b281e0953b0268a22357c5f43bd9657c (diff) | |
| parent | 9560e541c641e42222d8856add3ff3409b243f17 (diff) | |
| download | uhd-6eb6050269f469b982843b526eff80b37e8c5f3b.tar.gz uhd-6eb6050269f469b982843b526eff80b37e8c5f3b.tar.bz2 uhd-6eb6050269f469b982843b526eff80b37e8c5f3b.zip | |
Merge branch 'master' into u1e
* master:
allow other clock rates in vita time
report ise version in build
proper name for directory
name build directory with ISE version name
Diffstat (limited to 'usrp2/top')
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile | 2 | ||||
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile.udp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile index 541f3264f..f5cac7ad2 100644 --- a/usrp2/top/u2_rev3/Makefile +++ b/usrp2/top/u2_rev3/Makefile @@ -29,7 +29,7 @@ ISE_HELPER := ../tcl/ise_helper.tcl ################################################## # Project Setup ################################################## -BUILD_DIR := build/ +BUILD_DIR := build$(ISE)/ export TOP_MODULE := u2_rev3 export PROJ_FILE := $(BUILD_DIR)$(TOP_MODULE).ise diff --git a/usrp2/top/u2_rev3/Makefile.udp b/usrp2/top/u2_rev3/Makefile.udp index fa94c7bd1..217871dbb 100644 --- a/usrp2/top/u2_rev3/Makefile.udp +++ b/usrp2/top/u2_rev3/Makefile.udp @@ -29,7 +29,7 @@ ISE_HELPER := ../tcl/ise_helper.tcl ################################################## # Project Setup ################################################## -BUILD_DIR := build-udp/ +BUILD_DIR := build-udp$(ISE)/ export TOP_MODULE := u2_rev3 export PROJ_FILE := $(BUILD_DIR)$(TOP_MODULE).ise |