diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config/grc_usrp2.m4 | 11 | ||||
| -rw-r--r-- | usrp2/Makefile.am | 17 |
3 files changed, 25 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 91b0e5d22a..b5d4f94550 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,4 +33,4 @@ EXTRA_DIST = \ README.building-boost SUBDIRS = @build_dirs@ $(subdirs) -DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ +DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ $(subdirs) diff --git a/config/grc_usrp2.m4 b/config/grc_usrp2.m4 index f842a79a6c..ec88ab3453 100644 --- a/config/grc_usrp2.m4 +++ b/config/grc_usrp2.m4 @@ -25,14 +25,14 @@ AC_DEFUN([GRC_USRP2],[ GRC_CHECK_DEPENDENCY(usrp2, omnithread) dnl USRP2 host code only works on Linux at the moment - AC_MSG_CHECKING([whether host_cpu is linux*]) + AC_MSG_CHECKING([whether host_os is linux*]) case "$host_os" in linux*) - AC_MSG_RESULT("yes") + AC_MSG_RESULT([yes]) ;; *) - AC_MSG_RESULT("no") - echo "USRP2 requires Linux host OS, not found" + AC_MSG_RESULT([no]) + AC_MSG_NOTICE([USRP2 currently requires Linux host OS, not found]) passed="no" ;; esac @@ -47,7 +47,10 @@ AC_DEFUN([GRC_USRP2],[ if test $MB_GCC = yes; then dnl Adds usrp2/firmware to $(subdirs), hierarchical build AC_CONFIG_SUBDIRS([usrp2/firmware]) + else + AC_MSG_WARN([usrp2/firmware is not being built]) fi + AM_CONDITIONAL([BUILDING_USRP2_FIRMWARE],[test $MB_GCC = yes]) dnl Needed for usrp2_socket_opener AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h) diff --git a/usrp2/Makefile.am b/usrp2/Makefile.am index 1ea058902c..c478df9bc1 100644 --- a/usrp2/Makefile.am +++ b/usrp2/Makefile.am @@ -21,3 +21,20 @@ include $(top_srcdir)/Makefile.common SUBDIRS = host + +# KLUDGE ALERT! +# +# This kludge gets the files the host code needs into the tarball even if +# we're not building the firmware. +# +if !BUILDING_USRP2_FIRMWARE +EXTRA_DIST = \ + firmware/include/usrp2_cdefs.h \ + firmware/include/usrp2_cdefs.h \ + firmware/include/usrp2_eth_packet.h \ + firmware/include/usrp2_fpga_regs.h \ + firmware/include/usrp2_i2c_addr.h \ + firmware/include/usrp2_mac_addr.h \ + firmware/include/usrp2_mimo_config.h \ + firmware/include/usrp2_types.h +endif |