[Commit-gnuradio] r10021 - in gnuradio/branches/features/cppdb: config gnuradio-examples/c++ gr-usrp gr-usrp/apps

[jcorgan]

Author: jcorgan
Date: 2008-11-19 13:41:53 -0700 (Wed, 19 Nov 2008)
New Revision: 10021

Added:
   gnuradio/branches/features/cppdb/gr-usrp/apps/
Removed:
   gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/
Modified:
   gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4
   gnuradio/branches/features/cppdb/config/grc_gr_usrp.m4
   gnuradio/branches/features/cppdb/gnuradio-examples/c++/Makefile.am
   gnuradio/branches/features/cppdb/gr-usrp/Makefile.am
   gnuradio/branches/features/cppdb/gr-usrp/apps/Makefile.am
Log:
Move gr-usrp C++ test applications into gr-usrp/apps from gnuradio-examples

Modified: gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4    
2008-11-19 18:16:52 UTC (rev 10020)
+++ gnuradio/branches/features/cppdb/config/grc_gnuradio_examples.m4    
2008-11-19 20:41:53 UTC (rev 10021)
@@ -27,7 +27,6 @@
         gnuradio-examples/Makefile \
        gnuradio-examples/c++/Makefile \
         gnuradio-examples/c++/dial_tone/Makefile \
-       gnuradio-examples/c++/usrp_test/Makefile \
        gnuradio-examples/python/Makefile \
        gnuradio-examples/python/apps/hf_explorer/Makefile \
        gnuradio-examples/python/apps/hf_radio/Makefile \

Modified: gnuradio/branches/features/cppdb/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/features/cppdb/config/grc_gr_usrp.m4      2008-11-19 
18:16:52 UTC (rev 10020)
+++ gnuradio/branches/features/cppdb/config/grc_gr_usrp.m4      2008-11-19 
20:41:53 UTC (rev 10021)
@@ -28,6 +28,7 @@
         gr-usrp/Makefile \
         gr-usrp/src/Makefile \
         gr-usrp/src/run_tests \
+       gr-usrp/apps/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-usrp,[

Modified: gnuradio/branches/features/cppdb/gnuradio-examples/c++/Makefile.am
===================================================================
--- gnuradio/branches/features/cppdb/gnuradio-examples/c++/Makefile.am  
2008-11-19 18:16:52 UTC (rev 10020)
+++ gnuradio/branches/features/cppdb/gnuradio-examples/c++/Makefile.am  
2008-11-19 20:41:53 UTC (rev 10021)
@@ -20,4 +20,4 @@
 # 
 
 include $(top_srcdir)/Makefile.common
-SUBDIRS = dial_tone usrp_test
+SUBDIRS = dial_tone

Modified: gnuradio/branches/features/cppdb/gr-usrp/Makefile.am
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/Makefile.am        2008-11-19 
18:16:52 UTC (rev 10020)
+++ gnuradio/branches/features/cppdb/gr-usrp/Makefile.am        2008-11-19 
20:41:53 UTC (rev 10021)
@@ -22,4 +22,4 @@
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = README_MULTI_USRP.txt
-SUBDIRS = src
+SUBDIRS = src apps

Copied: gnuradio/branches/features/cppdb/gr-usrp/apps (from rev 10020, 
gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test)


Property changes on: gnuradio/branches/features/cppdb/gr-usrp/apps
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.libs
.deps
usrp_test_tx
usrp_test_rx

Name: svn:mergeinfo
   + 

Modified: gnuradio/branches/features/cppdb/gr-usrp/apps/Makefile.am
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/c++/usrp_test/Makefile.am    
    2008-11-19 18:16:52 UTC (rev 10020)
+++ gnuradio/branches/features/cppdb/gr-usrp/apps/Makefile.am   2008-11-19 
20:41:53 UTC (rev 10021)
@@ -28,9 +28,6 @@
         -I$(top_srcdir)/usrp/firmware/include \
         $(WITH_INCLUDES)
 
-#GR_USRP_LA=$(top_builddir)/gr-usrp/src/libusrp1.la \
-#      $(top_builddir)/usrp/host/lib/legacy/libusrp.la
-
 GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
 
 # For compiling outside the tree, these will get fished out by pkgconfig
@@ -49,9 +46,7 @@
 usrp_test_rx_LDADD = \
        -lboost_program_options-gcc43-mt-1_35 \
        $(GR_USRP_LA)
-#      $(GNURADIO_CORE_LA)
 
-
 usrp_test_tx_SOURCES =         \
     usrp_test_tx.cc