sdr
/
libusrp
mirror of https://gerrit.osmocom.org/libusrp
8
0
Fork 0
Code Releases Activity

Merged eb/usrp-install r4723:4727 into trunk. 

This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
This commit is contained in:
eb 2007-03-07 01:43:43 +00:00
parent a25cf48476
commit 0187af8e9e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
host/lib/Makefile.am
View File

@ -1,7 +1,7 @@
# #
# USRP - Universal Software Radio Peripheral # 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 # 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 # it under the terms of the GNU General Public License as published by
@ -137,7 +137,7 @@ noinst_HEADERS = \
rate_to_regval.h \ rate_to_regval.h \
usrp_local_sighandler.h usrp_local_sighandler.h
python_PYTHON = \ usrppython_PYTHON = \
usrp_dbid.py usrp_dbid.py
noinst_PYTHON = \ noinst_PYTHON = \

8
host/swig/Makefile.am
View File

@ -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 # This file is part of GNU Radio
# #
@ -21,11 +21,9 @@
include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.common
# This usually ends up at: ourpythondir = $(usrppythondir)
# ${prefix}/lib/python${python_version}/site-packages/usrp_prims ourlibdir = $(usrppyexecdir)
ourpythondir = $(pythondir)
ourlibdir = $(pyexecdir)
INCLUDES = $(USRP_INCLUDES) \ INCLUDES = $(USRP_INCLUDES) \
$(PYTHON_CPPFLAGS) \ $(PYTHON_CPPFLAGS) \

2
host/swig/usrp_fpga_regs.py
View File

@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA. # 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 # 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 # name space into our name space. This is effectively a python binding for