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

Partial fix for ticket 10 merged into trunk from 

branches/developers/jcorgan/ticket-10

As of this merge the trunk and the above branch are identical.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
This commit is contained in:
jcorgan 2006-08-06 04:31:17 +00:00
parent a6ebb4e561
commit fd1313c4db
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
host/apps/Makefile.am
View File

@ -19,7 +19,11 @@
# Boston, MA 02111-1307, USA.
#
INCLUDES = -I../lib -I$(top_srcdir)/usrp/firmware/include
include $(top_srcdir)/Makefile.common
INCLUDES = $(USRP_INCLUDES)
USRP_LIB = $(top_builddir)/usrp/host/lib/libusrp.la
bin_PROGRAMS = \
usrper \
@ -41,13 +45,13 @@ noinst_PYTHON = \
check_order_quickly_SOURCES = check_order_quickly.cc
test_usrp_standard_rx_SOURCES = test_usrp_standard_rx.cc time_stuff.c
test_usrp_standard_rx_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la
test_usrp_standard_rx_LDADD = $(USRP_LIB)
test_usrp_standard_tx_SOURCES = test_usrp_standard_tx.cc time_stuff.c
test_usrp_standard_tx_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la
test_usrp_standard_tx_LDADD = $(USRP_LIB)
usrper_SOURCES = usrper.cc
usrper_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la
usrper_LDADD = $(USRP_LIB)
usrp_cal_dc_offset_SOURCES = usrp_cal_dc_offset.cc
usrp_cal_dc_offset_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la
usrp_cal_dc_offset_LDADD = $(USRP_LIB)

5
host/lib/Makefile.am
View File

@ -17,7 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -I$(top_srcdir)/usrp/firmware/include
include $(top_srcdir)/Makefile.common
INCLUDES = $(USRP_INCLUDES)
lib_LTLIBRARIES = libusrp.la

8
host/swig/Makefile.am
View File

@ -1,5 +1,5 @@
#
# Copyright 2001,2003,2004 Free Software Foundation, Inc.
# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@ -27,6 +27,9 @@ include $(top_srcdir)/Makefile.common
ourpythondir = $(pythondir)
ourlibdir = $(pyexecdir)
INCLUDES = $(USRP_INCLUDES) \
$(PYTHON_CPPFLAGS) \
-I$(srcdir)
LOCAL_IFILES = \
prims.i
@ -51,9 +54,6 @@ ourpython_PYTHON = \
usrp_prims.py
INCLUDES = $(USRP_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir)
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)