[Commit-gnuradio] r9537 - in gnuradio/branches/developers/eb/distcheck: config usrp2

[eb]

Author: eb
Date: 2008-09-08 17:06:36 -0600 (Mon, 08 Sep 2008)
New Revision: 9537

Modified:
   gnuradio/branches/developers/eb/distcheck/config/grc_usrp2.m4
   gnuradio/branches/developers/eb/distcheck/usrp2/Makefile.am
Log:
distcheck now works without mb-gcc

Modified: gnuradio/branches/developers/eb/distcheck/config/grc_usrp2.m4
===================================================================
--- gnuradio/branches/developers/eb/distcheck/config/grc_usrp2.m4       
2008-09-08 22:05:28 UTC (rev 9536)
+++ gnuradio/branches/developers/eb/distcheck/config/grc_usrp2.m4       
2008-09-08 23:06:36 UTC (rev 9537)
@@ -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/branches/developers/eb/distcheck/usrp2/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/distcheck/usrp2/Makefile.am 2008-09-08 
22:05:28 UTC (rev 9536)
+++ gnuradio/branches/developers/eb/distcheck/usrp2/Makefile.am 2008-09-08 
23:06:36 UTC (rev 9537)
@@ -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