diff options
| author | Matt Ettus <matt@ettus.com> | 2010-06-08 10:37:58 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-06-08 10:37:58 -0700 |
| commit | 443e4b3d276edabee4c80929d14baf30598315b2 (patch) | |
| tree | ad7a2b3236d123a19e95aaebf1c15aca95996638 /usrp2/top | |
| parent | b7e1b9ce77a0df46a5b336fda1e1972aa8199488 (diff) | |
| parent | 9560e541c641e42222d8856add3ff3409b243f17 (diff) | |
| download | uhd-443e4b3d276edabee4c80929d14baf30598315b2.tar.gz uhd-443e4b3d276edabee4c80929d14baf30598315b2.tar.bz2 uhd-443e4b3d276edabee4c80929d14baf30598315b2.zip | |
Merge branch 'master' into u2p
* 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 7eedf5e7f..5eb9d9420 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 e445fe3b2..3be4203a8 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 |