[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4727 - in gnuradio/branches/developers/eb/usrp-instal
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r4727 - in gnuradio/branches/developers/eb/usrp-install: . gnuradio-examples/python/apps/hf_radio gnuradio-examples/python/multi-antenna gnuradio-examples/python/usrp gr-radio-astronomy/src/python gr-usrp/src usrp/host/lib usrp/host/swig |
|
Date: |
Tue, 6 Mar 2007 18:39:31 -0700 (MST) |
Author: eb
Date: 2007-03-06 18:39:30 -0700 (Tue, 06 Mar 2007)
New Revision: 4727
Modified:
gnuradio/branches/developers/eb/usrp-install/Makefile.common
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/apps/hf_radio/input.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_fft.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_file.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_scope.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx4.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_tv_rcv.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_psr_receiver.py
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_ra_receiver.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_base.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_basic.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_dbs_rx.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf_mimo.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_tv_rx.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp.py
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp_multi.py
gnuradio/branches/developers/eb/usrp-install/usrp/host/lib/Makefile.am
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/Makefile.am
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/usrp_fpga_regs.py
Log:
Moved usrp related files out of the top-level of site-packages and
into site-packages/usrpm
Modified: gnuradio/branches/developers/eb/usrp-install/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/Makefile.common
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/Makefile.common
2007-03-07 01:39:30 UTC (rev 4727)
@@ -28,13 +28,21 @@
# swig includes
swigincludedir = $(grincludedir)/swig
-# Install this stuff in the appropriate subdirectory
+# Install the gnuradio stuff in the appropriate subdirectory
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
grpythondir = $(pythondir)/gnuradio
grpyexecdir = $(pyexecdir)/gnuradio
+# Install the non-gnuradio usrp stuff in the appropriate subdirectory
+# This usually ends up at:
+# ${prefix}/lib/python${python_version}/site-packages/usrpm
+
+usrppythondir = $(pythondir)/usrpm
+usrppyexecdir = $(pyexecdir)/usrpm
+
+
# swig flags
SWIGPYTHONFLAGS = -fvirtual -python -modern
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/apps/hf_radio/input.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/apps/hf_radio/input.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/apps/hf_radio/input.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -7,7 +7,7 @@
from gnuradio import gr, gru, optfir
from gnuradio import usrp
-import usrp_dbid
+from usrpm import usrp_dbid
import math
# Put special knowlege of usrp here.
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_fft.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_fft.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_fft.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from optparse import OptionParser
from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form,
slider
import wx
-import usrp_dbid
+from usrpm import usrp_dbid
import time
import os.path
import sys
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_file.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_file.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_file.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from optparse import OptionParser
from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form,
slider
import wx
-import usrp_dbid
+from usrpm import usrp_dbid
import time
import os.path
import sys
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_scope.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_scope.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/multi-antenna/multi_scope.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from optparse import OptionParser
from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form,
slider
import wx
-import usrp_dbid
+from usrpm import usrp_dbid
import time
import os.path
import sys
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx4.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx4.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx4.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -18,7 +18,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import math
import sys
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -17,7 +17,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import math
import sys
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -31,7 +31,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from gnuradio.wxgui import stdgui, fftsink, scopesink, slider, form
-import usrp_dbid
+from usrpm import usrp_dbid
from Numeric import convolve, array
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -6,7 +6,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import struct
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_tv_rcv.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_tv_rcv.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_tv_rcv.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -21,7 +21,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -6,7 +6,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -6,7 +6,7 @@
from gnuradio import blks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form, scopesink
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -59,7 +59,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -8,7 +8,7 @@
from gnuradio.wxgui import slider, powermate
from gnuradio.wxgui import stdgui, fftsink, form
from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
import sys
import math
import wx
Modified:
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_psr_receiver.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_psr_receiver.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_psr_receiver.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -30,7 +30,7 @@
#
#
from gnuradio import gr, gru, blks, audio
-import usrp_dbid
+from usrpm import usrp_dbid
from gnuradio import usrp, optfir
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
Modified:
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_ra_receiver.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/gr-radio-astronomy/src/python/usrp_ra_receiver.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -22,7 +22,7 @@
from gnuradio import gr, gru
from gnuradio import usrp
-import usrp_dbid
+from usrpm import usrp_dbid
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
from gnuradio.wxgui import stdgui, ra_fftsink, ra_stripchartsink,
ra_waterfallsink, form, slider
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_base.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_base.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_base.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -19,9 +19,9 @@
# Boston, MA 02110-1301, USA.
#
-import usrp_prims
import weakref
-from usrp_fpga_regs import *
+from usrpm import usrp_prims
+from usrpm.usrp_fpga_regs import *
class db_base(object):
"""
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_basic.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_basic.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_basic.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -20,7 +20,7 @@
#
import sys
-import usrp_dbid
+from usrpm import usrp_dbid
import db_base
import db_instantiator
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_dbs_rx.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_dbs_rx.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_dbs_rx.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -20,7 +20,7 @@
#
import math
-import usrp_dbid
+from usrpm import usrp_dbid
import db_base
import db_instantiator
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -22,10 +22,10 @@
from gnuradio import usrp1
import time,math
-import usrp_dbid
+from usrpm import usrp_dbid
import db_base
import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
#debug_using_gui = True # Must be set to True or False
debug_using_gui = False # Must be set to True or False
Modified:
gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf_mimo.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf_mimo.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_flexrf_mimo.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -22,10 +22,10 @@
from gnuradio import usrp1
import time,math
-import usrp_dbid
+from usrpm import usrp_dbid
import db_base
import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
from db_flexrf import *
# self._u.fpga_master_clock_freq()
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_tv_rx.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_tv_rx.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/db_tv_rx.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -22,7 +22,7 @@
__all__ = ['tv_rx']
import math
-import usrp_dbid
+from usrpm import usrp_dbid
import db_base
import db_instantiator
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -21,11 +21,11 @@
-import usrp_prims
-import usrp_dbid
+from usrpm import usrp_prims
+from usrpm import usrp_dbid
from gnuradio import usrp1 # usrp Rev 1 and later
from gnuradio import gru
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
FPGA_MODE_NORMAL = usrp1.FPGA_MODE_NORMAL
FPGA_MODE_LOOPBACK = usrp1.FPGA_MODE_LOOPBACK
Modified: gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp_multi.py
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp_multi.py
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/gr-usrp/src/usrp_multi.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -25,7 +25,7 @@
from gnuradio import usrp
from gnuradio import usrp1 # usrp Rev 1 and later
from gnuradio import blks
-import usrp_prims
+from usrpm import usrp_prims
import sys
Modified: gnuradio/branches/developers/eb/usrp-install/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/usrp/host/lib/Makefile.am
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/usrp/host/lib/Makefile.am
2007-03-07 01:39:30 UTC (rev 4727)
@@ -1,7 +1,7 @@
#
# USRP - Universal Software Radio Peripheral
#
-# Copyright (C) 2003,2004,2006 Free Software Foundation, Inc.
+# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@
rate_to_regval.h \
usrp_local_sighandler.h
-python_PYTHON = \
+usrppython_PYTHON = \
usrp_dbid.py
noinst_PYTHON = \
Modified:
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/Makefile.am
2007-03-06 23:41:13 UTC (rev 4726)
+++ gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/Makefile.am
2007-03-07 01:39:30 UTC (rev 4727)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,11 +21,9 @@
include $(top_srcdir)/Makefile.common
-# This usually ends up at:
-# ${prefix}/lib/python${python_version}/site-packages/usrp_prims
+ourpythondir = $(usrppythondir)
+ourlibdir = $(usrppyexecdir)
-ourpythondir = $(pythondir)
-ourlibdir = $(pyexecdir)
INCLUDES = $(USRP_INCLUDES) \
$(PYTHON_CPPFLAGS) \
Modified:
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/usrp_fpga_regs.py
===================================================================
---
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/usrp_fpga_regs.py
2007-03-06 23:41:13 UTC (rev 4726)
+++
gnuradio/branches/developers/eb/usrp-install/usrp/host/swig/usrp_fpga_regs.py
2007-03-07 01:39:30 UTC (rev 4727)
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-import usrp_prims
+from usrpm import usrp_prims
# Copy everything that starts with FR_ or bmFR_ from the usrp_prims
# name space into our name space. This is effectively a python binding for
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4727 - in gnuradio/branches/developers/eb/usrp-install: . gnuradio-examples/python/apps/hf_radio gnuradio-examples/python/multi-antenna gnuradio-examples/python/usrp gr-radio-astronomy/src/python gr-usrp/src usrp/host/lib usrp/host/swig,
eb <=