[Commit-gnuradio] r11390 - in gnuradio/branches/developers/jcorgan/usrp-headers: config gnuradio-core/src/lib/io usrp usrp/host/lib

[jcorgan]

Author: jcorgan
Date: 2009-07-08 19:54:30 -0600 (Wed, 08 Jul 2009)
New Revision: 11390

Removed:
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/usrp-inband.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4
   
gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/io/gri_wavfile.cc
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/Makefile.am
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/gen_usrp_dbid.py
Log:
USRP 'legacy' directory now just 'lib', branch passes distcheck, out of tree 
builds using libusrp tested.

Modified: gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4        
2009-07-09 01:32:20 UTC (rev 11389)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4        
2009-07-09 01:54:30 UTC (rev 11390)
@@ -56,7 +56,7 @@
                -I\${abs_top_srcdir}/usrp/host/include \
                -I\${abs_top_builddir}/usrp/host/include \
                -I\${abs_top_srcdir}/usrp/firmware/include"
-        usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
+        usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la"
     fi
 
     dnl There pkg-config file for usrp requires omnithread for Darwin only.  
Create a variable
@@ -83,8 +83,7 @@
        usrp/host/include/usrp/Makefile \
         usrp/host/misc/Makefile \
         usrp/host/lib/Makefile \
-        usrp/host/lib/legacy/Makefile \
-        usrp/host/lib/legacy/std_paths.h \
+        usrp/host/lib/std_paths.h \
         usrp/host/swig/Makefile \
         usrp/host/apps/Makefile \
         usrp/firmware/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/io/gri_wavfile.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/io/gri_wavfile.cc
   2009-07-09 01:32:20 UTC (rev 11389)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/io/gri_wavfile.cc
   2009-07-09 01:54:30 UTC (rev 11390)
@@ -32,8 +32,7 @@
 
 // WAV files are always little-endian, so we need some byte switching macros
 
-// FIXME: These need to be refactored into a separate endianess header file
-// as they duplicate routines defined in usrp/host/lib/legacy/usrp_bytesex.h
+// FIXME: Use libgruel versions
 
 #ifdef WORDS_BIGENDIAN
 

Modified: gnuradio/branches/developers/jcorgan/usrp-headers/usrp/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/usrp/Makefile.am  
2009-07-09 01:32:20 UTC (rev 11389)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/usrp/Makefile.am  
2009-07-09 01:54:30 UTC (rev 11390)
@@ -21,7 +21,6 @@
 
 EXTRA_DIST = \
        usrp.pc.in \
-       usrp-inband.pc.in \
        usrp.iss.in \
        usrp.inf
 
@@ -29,6 +28,4 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-       usrp.pc \
-       usrp-inband.pc
-
+       usrp.pc

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am 
2009-07-09 01:32:20 UTC (rev 11389)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am 
2009-07-09 01:54:30 UTC (rev 11390)
@@ -29,7 +29,7 @@
 libusrp_la_common_LIBADD =             \
        $(USB_LIBS)                     \
        $(BOOST_THREAD_LIB)             \
-       ../../misc/libmisc.la
+       ../misc/libmisc.la
 
 # darwin fusb requires omnithreads
 if FUSB_TECH_darwin

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/gen_usrp_dbid.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/gen_usrp_dbid.py
    2009-07-09 01:32:20 UTC (rev 11389)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/gen_usrp_dbid.py
    2009-07-09 01:54:30 UTC (rev 11390)
@@ -25,7 +25,7 @@
         f.write('%-16s = %s\n' % (x[1], x[2]))
 
 def gen_dbid_h(r):
-    f = open('../../include/usrp/usrp_dbid.h', 'w')
+    f = open('../include/usrp/usrp_dbid.h', 'w')
     comment_char = '//'
     write_header(f, comment_char)
     f.write(comment_char); f.write('\n')