[Commit-gnuradio] r11619 - in gnuradio/trunk: config gr-vrt gr-vrt/src omnithread vrt vrt/apps vrt/lib

[git]

Author: git
Date: 2009-08-20 08:17:04 -0600 (Thu, 20 Aug 2009)
New Revision: 11619

Added:
   gnuradio/trunk/gr-vrt/.gitignore
   gnuradio/trunk/gr-vrt/src/.gitignore
   gnuradio/trunk/omnithread/README
   gnuradio/trunk/vrt/.gitignore
   gnuradio/trunk/vrt/apps/.gitignore
   gnuradio/trunk/vrt/lib/.gitignore
Modified:
   gnuradio/trunk/config/grc_vrt.m4
   gnuradio/trunk/omnithread/Makefile.am
Log:
Merge branch 'master' of ../../repositories/gnuradio

Modified: gnuradio/trunk/config/grc_vrt.m4
===================================================================
--- gnuradio/trunk/config/grc_vrt.m4    2009-08-20 03:00:59 UTC (rev 11618)
+++ gnuradio/trunk/config/grc_vrt.m4    2009-08-20 14:17:04 UTC (rev 11619)
@@ -34,6 +34,19 @@
         VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la"
     fi
 
+    # Test host OS compatibility
+    AC_MSG_CHECKING([whether host_os is linux*])
+    case "$host_os" in
+      linux*)
+       AC_MSG_RESULT([yes])
+        ;;
+      *)
+       AC_MSG_RESULT([no])
+       AC_MSG_NOTICE([libvrt currently requires Linux host OS, not found])
+        passed="no"
+        ;;
+    esac
+
     dnl Include the vrt INCLUDES and LA
     AC_SUBST(VRT_INCLUDES)
     AC_SUBST(VRT_LA)

Added: gnuradio/trunk/gr-vrt/.gitignore
===================================================================
--- gnuradio/trunk/gr-vrt/.gitignore                            (rev 0)
+++ gnuradio/trunk/gr-vrt/.gitignore    2009-08-20 14:17:04 UTC (rev 11619)
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+gnuradio-vrt.pc

Added: gnuradio/trunk/gr-vrt/src/.gitignore
===================================================================
--- gnuradio/trunk/gr-vrt/src/.gitignore                                (rev 0)
+++ gnuradio/trunk/gr-vrt/src/.gitignore        2009-08-20 14:17:04 UTC (rev 
11619)
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+.deps
+.libs
+run_tests
+vrt.py
+vrt.pyc
+vrt.cc

Modified: gnuradio/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am       2009-08-20 03:00:59 UTC (rev 
11618)
+++ gnuradio/trunk/omnithread/Makefile.am       2009-08-20 14:17:04 UTC (rev 
11619)
@@ -67,4 +67,5 @@
        solaris.cc                      \
        threaddata.cc                   \
        vxWorks.cc                      \
-       dir.mk
+       dir.mk                          \
+       README

Added: gnuradio/trunk/omnithread/README
===================================================================
--- gnuradio/trunk/omnithread/README                            (rev 0)
+++ gnuradio/trunk/omnithread/README    2009-08-20 14:17:04 UTC (rev 11619)
@@ -0,0 +1,2 @@
+The code in this directory is deprecated, please use the Boost thread
+library for new code.

Added: gnuradio/trunk/vrt/.gitignore
===================================================================
--- gnuradio/trunk/vrt/.gitignore                               (rev 0)
+++ gnuradio/trunk/vrt/.gitignore       2009-08-20 14:17:04 UTC (rev 11619)
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+vrt.pc

Added: gnuradio/trunk/vrt/apps/.gitignore
===================================================================
--- gnuradio/trunk/vrt/apps/.gitignore                          (rev 0)
+++ gnuradio/trunk/vrt/apps/.gitignore  2009-08-20 14:17:04 UTC (rev 11619)
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+.libs
+simple_rx_samples

Added: gnuradio/trunk/vrt/lib/.gitignore
===================================================================
--- gnuradio/trunk/vrt/lib/.gitignore                           (rev 0)
+++ gnuradio/trunk/vrt/lib/.gitignore   2009-08-20 14:17:04 UTC (rev 11619)
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+.deps
+.libs