Revision 202d13ad

b/Makefile.am
33 33
	README.building-boost
34 34

35 35
SUBDIRS = @build_dirs@ $(subdirs)
36
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@
36
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ $(subdirs)
b/config/grc_usrp2.m4
25 25
    GRC_CHECK_DEPENDENCY(usrp2, omnithread)
26 26

27 27
    dnl USRP2 host code only works on Linux at the moment
28
    AC_MSG_CHECKING([whether host_cpu is linux*])
28
    AC_MSG_CHECKING([whether host_os is linux*])
29 29
    case "$host_os" in
30 30
      linux*)
31
	AC_MSG_RESULT("yes")
31
	AC_MSG_RESULT([yes])
32 32
        ;;
33 33
      *)
34
	AC_MSG_RESULT("no")
35
	echo "USRP2 requires Linux host OS, not found"
34
	AC_MSG_RESULT([no])
35
	AC_MSG_NOTICE([USRP2 currently requires Linux host OS, not found])
36 36
        passed="no"
37 37
        ;;
38 38
    esac
......
47 47
	if test $MB_GCC = yes; then
48 48
	    dnl Adds usrp2/firmware to $(subdirs), hierarchical build
49 49
	    AC_CONFIG_SUBDIRS([usrp2/firmware])
50
	else
51
	    AC_MSG_WARN([usrp2/firmware is not being built])
50 52
	fi
53
	AM_CONDITIONAL([BUILDING_USRP2_FIRMWARE],[test $MB_GCC = yes])
51 54

52 55
	dnl Needed for usrp2_socket_opener
53 56
	AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h)
b/usrp2/Makefile.am
21 21
include $(top_srcdir)/Makefile.common
22 22

23 23
SUBDIRS = host
24

25
# KLUDGE ALERT!
26
#
27
# This kludge gets the files the host code needs into the tarball even if
28
# we're not building the firmware.
29
#
30
if !BUILDING_USRP2_FIRMWARE
31
EXTRA_DIST = \
32
    firmware/include/usrp2_cdefs.h \
33
    firmware/include/usrp2_cdefs.h \
34
    firmware/include/usrp2_eth_packet.h \
35
    firmware/include/usrp2_fpga_regs.h \
36
    firmware/include/usrp2_i2c_addr.h \
37
    firmware/include/usrp2_mac_addr.h \
38
    firmware/include/usrp2_mimo_config.h \
39
    firmware/include/usrp2_types.h
40
endif

Also available in: Unified diff