[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7502 - in gnuradio/branches/developers/michaelld/t186
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7502 - in gnuradio/branches/developers/michaelld/t186: config gnuradio-examples/python gr-atsc/src/lib gr-atsc/src/python gr-trellis/src/examples usrp/host/apps-inband |
|
Date: |
Wed, 23 Jan 2008 16:05:25 -0700 (MST) |
Author: michaelld
Date: 2008-01-23 16:05:24 -0700 (Wed, 23 Jan 2008)
New Revision: 7502
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/python/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/python/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/examples/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/gmac.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_gmac_tx.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_cs.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_overrun.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_ping.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_registers.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_rx.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_tx.cc
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_underrun.cc
Log:
Removed "#include <mb_mblock_impl.h>" from apps-inband .cc files,
since it isn't needed and shouldn't be included.
Corrected error printouts in some grc_*.m4 files.
For Makefile.am's that use "install-data-local" to "chmod" installed
files, made this depend upon "install-ourdataDATA" so that the files
get installed -before- doing the "chmod".
Corrected SWIG ARGS in gr-atsc.
Corrected dependencies in grc_usrp and grc_pmt.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-23 16:29:00 UTC (rev 7501)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-23 23:05:24 UTC (rev 7502)
@@ -46,9 +46,9 @@
pmt/src/scheme/gnuradio/Makefile \
])
passed=yes
- # Don't do mblock if omnithread or pmt skipped
+ # Don't do pmt if omnithread skipped
if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component mblock requires omnithread, which is not
being built or specified via pre-installed files.])
+ AC_MSG_RESULT([Component pmt requires omnithread, which is not
being built or specified via pre-installed files.])
passed=no
fi
# Don't do pmt if guile not available
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-23 16:29:00 UTC (rev 7501)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-23 23:05:24 UTC (rev 7502)
@@ -99,16 +99,19 @@
;;
esac
passed=yes
- # Don't do usrp if omnithread skipped
+ # Don't do usrp if omnithread, mblock, or pmt skipped
if test x$omnithread_skipped = xyes; then
AC_MSG_RESULT([Component usrp requires omnithread, which is not
being built or specified via pre-installed files.])
passed=no
fi
- # Don't do usrp if mblock skipped
if test x$mblock_skipped = xyes; then
AC_MSG_RESULT([Component usrp requires mblock, which is not being
built or specified via pre-installed files.])
passed=no
fi
+ if test x$pmt_skipped = xyes; then
+ AC_MSG_RESULT([Component usrp requires pmt, which is not being
built or specified via pre-installed files.])
+ passed=no
+ fi
# Don't do mblock if guile not available (inband requires it)
AC_PATH_PROG(GUILE,guile)
if test "$GUILE" = "" ; then
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/python/Makefile.am
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/python/Makefile.am
2008-01-23 23:05:24 UTC (rev 7502)
@@ -34,7 +34,7 @@
usrp
# Make example scripts with #! executable
-install-data-local:
+install-data-local: install-ourdataDATA
for i in `find $(exampledir) -type f ! -perm 755`; do \
if head -1 $$i | grep -q '^#!'; then \
chmod 755 $$i; \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-23 16:29:00 UTC (rev 7501)
+++ gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-23 23:05:24 UTC (rev 7502)
@@ -215,7 +215,7 @@
# ------------------------------------------------------------------------
SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \
- $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES)
+ $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
ALL_IFILES = \
$(LOCAL_IFILES) \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/python/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-atsc/src/python/Makefile.am
2008-01-23 16:29:00 UTC (rev 7501)
+++ gnuradio/branches/developers/michaelld/t186/gr-atsc/src/python/Makefile.am
2008-01-23 23:05:24 UTC (rev 7502)
@@ -28,7 +28,6 @@
interp.py \
xlate.py \
viterbi-out.py
-
EXTRA_DIST = run_tests.in \
$(EXAMPLE_FILES)
@@ -46,7 +45,7 @@
qa_atsc.py
# Make example scripts with #! executable
-install-data-local:
+install-data-local: install-ourdataDATA
for i in `find $(ourdatadir) -type f ! -perm 755`; do \
if head -1 $$i | grep -q '^#!'; then \
chmod 755 $$i; \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/examples/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/examples/Makefile.am
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/examples/Makefile.am
2008-01-23 23:05:24 UTC (rev 7502)
@@ -45,7 +45,7 @@
ourdata_DATA = $(EXTRA_DIST)
# Make example scripts with #! executable
-install-data-local:
+install-data-local: install-ourdataDATA
for i in `find $(ourdatadir) -type f ! -perm 755`; do \
if head -1 $$i | grep -q '^#!'; then \
chmod 755 $$i; \
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/gmac.cc
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/gmac.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++ gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/gmac.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -31,7 +31,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_gmac_tx.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_gmac_tx.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_gmac_tx.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_cs.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_cs.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_cs.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_overrun.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_overrun.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_overrun.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_ping.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_ping.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_ping.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_registers.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_registers.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_registers.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,7 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
+//#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_rx.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_rx.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_rx.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_tx.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_tx.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_tx.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_underrun.cc
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_underrun.cc
2008-01-23 16:29:00 UTC (rev 7501)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/test_usrp_inband_underrun.cc
2008-01-23 23:05:24 UTC (rev 7502)
@@ -29,7 +29,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7502 - in gnuradio/branches/developers/michaelld/t186: config gnuradio-examples/python gr-atsc/src/lib gr-atsc/src/python gr-trellis/src/examples usrp/host/apps-inband,
michaelld <=