[Commit-gnuradio] r9538 - in gnuradio/trunk: . config usrp2

[eb]

Author: eb
Date: 2008-09-08 17:08:46 -0600 (Mon, 08 Sep 2008)
New Revision: 9538

Modified:
   gnuradio/trunk/Makefile.am
   gnuradio/trunk/config/grc_usrp2.m4
   gnuradio/trunk/usrp2/Makefile.am
Log:
Now passes distcheck with or without microblaze tools on path.
Merged eb/distcheck 9534:9537 into trunk.


Modified: gnuradio/trunk/Makefile.am
===================================================================
--- gnuradio/trunk/Makefile.am  2008-09-08 23:06:36 UTC (rev 9537)
+++ gnuradio/trunk/Makefile.am  2008-09-08 23:08:46 UTC (rev 9538)
@@ -33,4 +33,4 @@
        README.building-boost
 
 SUBDIRS = @build_dirs@ $(subdirs)
-DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@
+DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ $(subdirs)

Modified: gnuradio/trunk/config/grc_usrp2.m4
===================================================================
--- gnuradio/trunk/config/grc_usrp2.m4  2008-09-08 23:06:36 UTC (rev 9537)
+++ gnuradio/trunk/config/grc_usrp2.m4  2008-09-08 23:08:46 UTC (rev 9538)
@@ -25,14 +25,14 @@
     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 @@
        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)

Modified: gnuradio/trunk/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp2/Makefile.am    2008-09-08 23:06:36 UTC (rev 9537)
+++ gnuradio/trunk/usrp2/Makefile.am    2008-09-08 23:08:46 UTC (rev 9538)
@@ -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