projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial compile of wbxng, properly sets db IDs
[debian/gnuradio]
/
usrp
/
host
/
lib
/
Makefile.am
diff --git
a/usrp/host/lib/Makefile.am
b/usrp/host/lib/Makefile.am
index 8482485f58533090682703213bc32d79e271e0dc..4b889993b753ba14b49f27583a1dbbaa7edd0118 100644
(file)
--- a/
usrp/host/lib/Makefile.am
+++ b/
usrp/host/lib/Makefile.am
@@
-20,7
+20,7
@@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.common
-common_INCLUDES = $(USRP_INCLUDES)
+common_INCLUDES = $(USRP_INCLUDES)
$(USB_INCLUDES)
lib_LTLIBRARIES = libusrp.la
lib_LTLIBRARIES = libusrp.la
@@
-44,13
+44,12
@@
endif
EXTRA_DIST = \
std_paths.h.in \
EXTRA_DIST = \
std_paths.h.in \
- usrp_dbid.dat
+ usrp_dbid.dat
-BUILT_SOURCES = \
- $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
BUILT_SOURCES += usrp_dbid.cc \
BUILT_SOURCES += usrp_dbid.cc \
- usrp_dbid.py
+ usrp_dbid.py
# ----------------------------------------------------------------
# FUSB_TECH is set at configure time by way of
# ----------------------------------------------------------------
# FUSB_TECH is set at configure time by way of
@@
-61,7
+60,9
@@
BUILT_SOURCES += usrp_dbid.cc \
generic_CODE = \
fusb_generic.cc \
generic_CODE = \
fusb_generic.cc \
- fusb_sysconfig_generic.cc
+ fusb_sysconfig_generic.cc \
+ usrp_prims_libusb0.cc \
+ usrp_basic_libusb0.cc
darwin_CODE = \
fusb_darwin.cc \
darwin_CODE = \
fusb_darwin.cc \
@@
-70,20
+71,35
@@
darwin_CODE = \
circular_buffer.h \
circular_linked_list.h \
darwin_libusb.h \
circular_buffer.h \
circular_linked_list.h \
darwin_libusb.h \
- mld_threads.h
+ mld_threads.h \
+ usrp_prims_libusb0.cc \
+ usrp_basic_libusb0.cc
+
win32_CODE = \
fusb_win32.cc \
win32_CODE = \
fusb_win32.cc \
- fusb_sysconfig_win32.cc
+ fusb_sysconfig_win32.cc \
+ usrp_prims_libusb0.cc \
+ usrp_basic_libusb0.cc
+
linux_CODE = \
fusb_linux.cc \
linux_CODE = \
fusb_linux.cc \
- fusb_sysconfig_linux.cc
+ fusb_sysconfig_linux.cc \
+ usrp_prims_libusb0.cc \
+ usrp_basic_libusb0.cc
ra_wb_CODE = \
fusb_ra_wb.cc \
ra_wb_CODE = \
fusb_ra_wb.cc \
- fusb_sysconfig_ra_wb.cc
+ fusb_sysconfig_ra_wb.cc \
+ usrp_prims_libusb0.cc \
+ usrp_basic_libusb0.cc
+libusb1_CODE = \
+ fusb_libusb1.cc \
+ fusb_sysconfig_libusb1.cc \
+ usrp_prims_libusb1.cc \
+ usrp_basic_libusb1.cc
#
# include each <foo>_CODE entry here...
#
# include each <foo>_CODE entry here...
@@
-93,33
+109,33
@@
EXTRA_libusrp_la_SOURCES = \
$(darwin_CODE) \
$(win32_CODE) \
$(linux_CODE) \
$(darwin_CODE) \
$(win32_CODE) \
$(linux_CODE) \
- $(ra_wb_CODE)
-
+ $(ra_wb_CODE)
\
+ $(libusb1_CODE)
# work around automake deficiency
libusrp_la_common_SOURCES = \
fusb.cc \
md5.c \
# work around automake deficiency
libusrp_la_common_SOURCES = \
fusb.cc \
md5.c \
- usrp_basic
.cc
\
+ usrp_basic
_common.cc
\
usrp_config.cc \
usrp_dbid.cc \
usrp_local_sighandler.cc \
usrp_config.cc \
usrp_dbid.cc \
usrp_local_sighandler.cc \
- usrp_prims
.cc
\
+ usrp_prims
_common.cc
\
usrp_standard.cc \
db_boards.cc \
db_base.cc \
db_basic.cc \
db_tv_rx.cc \
usrp_standard.cc \
db_boards.cc \
db_base.cc \
db_basic.cc \
db_tv_rx.cc \
+ db_tv_rx_mimo.cc \
db_flexrf.cc \
db_flexrf_mimo.cc \
db_dbs_rx.cc \
db_flexrf.cc \
db_flexrf_mimo.cc \
db_dbs_rx.cc \
+ db_wbxng.cc \
db_xcvr2450.cc \
db_dtt754.cc \
db_dtt768.cc \
db_util.cc
db_xcvr2450.cc \
db_dtt754.cc \
db_dtt768.cc \
db_util.cc
-
-
if FUSB_TECH_generic
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
endif
if FUSB_TECH_generic
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
endif
@@
-140,6
+156,11
@@
if FUSB_TECH_ra_wb
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
endif
libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
endif
+if FUSB_TECH_libusb1
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(libusb1_CODE)
+endif
+
+
noinst_HEADERS = \
ad9862.h \
db_base_impl.h \
noinst_HEADERS = \
ad9862.h \
db_base_impl.h \
@@
-149,11
+170,13
@@
noinst_HEADERS = \
fusb_darwin.h \
fusb_generic.h \
fusb_linux.h \
fusb_darwin.h \
fusb_generic.h \
fusb_linux.h \
+ fusb_libusb1.h \
fusb_ra_wb.h \
fusb_win32.h \
md5.h \
rate_to_regval.h \
fusb_ra_wb.h \
fusb_win32.h \
md5.h \
rate_to_regval.h \
- usrp_config.h
+ usrp_config.h \
+ usrp_primsi.h
if PYTHON
usrppython_PYTHON = \
if PYTHON
usrppython_PYTHON = \