projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch source package format to 3.0 quilt
[debian/gnuradio]
/
usrp
/
host
/
lib
/
Makefile.am
diff --git
a/usrp/host/lib/Makefile.am
b/usrp/host/lib/Makefile.am
index 72312ebbb37b8a8d2f8b70c558d06f4d2d17cc19..23889fc85a25822b313dcb62883c0f08a684c028 100644
(file)
--- a/
usrp/host/lib/Makefile.am
+++ b/
usrp/host/lib/Makefile.am
@@
-1,7
+1,7
@@
#
# USRP - Universal Software Radio Peripheral
#
#
# USRP - Universal Software Radio Peripheral
#
-# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright (C) 2003,2004,2006,2007,2008,2009
,2010
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
#
# 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
@@
-24,17
+24,17
@@
common_INCLUDES = $(USRP_INCLUDES) $(USB_INCLUDES)
lib_LTLIBRARIES = libusrp.la
lib_LTLIBRARIES = libusrp.la
-libusrp_la_common_LDFLAGS = $(NO_UNDEFINED)
-version-info 0:0:0
$(BOOST_LDFLAGS)
+libusrp_la_common_LDFLAGS = $(NO_UNDEFINED)
$(LTVERSIONFLAGS)
$(BOOST_LDFLAGS)
libusrp_la_common_LIBADD = \
$(USB_LIBS) \
$(BOOST_THREAD_LIB) \
../misc/libmisc.la
libusrp_la_common_LIBADD = \
$(USB_LIBS) \
$(BOOST_THREAD_LIB) \
../misc/libmisc.la
-# darwin fusb requires
omnithreads
+# darwin fusb requires
gruel (for threading)
if FUSB_TECH_darwin
if FUSB_TECH_darwin
-AM_CPPFLAGS = $(common_INCLUDES) $(
OMNITHREAD
_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(
OMNITHREAD
_LA)
+AM_CPPFLAGS = $(common_INCLUDES) $(
GRUEL
_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
+libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(
GRUEL
_LA)
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
else
AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
else
AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
@@
-61,8
+61,7
@@
BUILT_SOURCES += usrp_dbid.cc \
generic_CODE = \
fusb_generic.cc \
fusb_sysconfig_generic.cc \
generic_CODE = \
fusb_generic.cc \
fusb_sysconfig_generic.cc \
- usrp_prims_libusb0.cc \
- usrp_basic_libusb0.cc
+ usrp_prims_libusb0.cc
darwin_CODE = \
fusb_darwin.cc \
darwin_CODE = \
fusb_darwin.cc \
@@
-71,35
+70,29
@@
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 \
- usrp_prims_libusb0.cc \
- usrp_basic_libusb0.cc
+ usrp_prims_libusb0.cc
win32_CODE = \
fusb_win32.cc \
fusb_sysconfig_win32.cc \
win32_CODE = \
fusb_win32.cc \
fusb_sysconfig_win32.cc \
- usrp_prims_libusb0.cc \
- usrp_basic_libusb0.cc
+ usrp_prims_libusb0.cc
linux_CODE = \
fusb_linux.cc \
fusb_sysconfig_linux.cc \
linux_CODE = \
fusb_linux.cc \
fusb_sysconfig_linux.cc \
- usrp_prims_libusb0.cc \
- usrp_basic_libusb0.cc
+ usrp_prims_libusb0.cc
ra_wb_CODE = \
fusb_ra_wb.cc \
fusb_sysconfig_ra_wb.cc \
ra_wb_CODE = \
fusb_ra_wb.cc \
fusb_sysconfig_ra_wb.cc \
- usrp_prims_libusb0.cc \
- usrp_basic_libusb0.cc
+ usrp_prims_libusb0.cc
libusb1_CODE = \
fusb_libusb1.cc \
fusb_sysconfig_libusb1.cc \
libusb1_CODE = \
fusb_libusb1.cc \
fusb_sysconfig_libusb1.cc \
- usrp_prims_libusb1.cc \
- usrp_basic_libusb1.cc
+ usrp_prims_libusb1.cc
#
# include each <foo>_CODE entry here...
#
# include each <foo>_CODE entry here...
@@
-116,17
+109,18
@@
EXTRA_libusrp_la_SOURCES = \
libusrp_la_common_SOURCES = \
fusb.cc \
md5.c \
libusrp_la_common_SOURCES = \
fusb.cc \
md5.c \
- usrp_basic
_common.cc
\
+ usrp_basic
.cc
\
usrp_config.cc \
usrp_dbid.cc \
usrp_local_sighandler.cc \
usrp_prims_common.cc \
usrp_standard.cc \
usrp_config.cc \
usrp_dbid.cc \
usrp_local_sighandler.cc \
usrp_prims_common.cc \
usrp_standard.cc \
- db_wbxng_adf4350.cc
\
- db_wbxng_adf4350_regs.cc
\
+ db_wbxng_adf4350.cc \
+ db_wbxng_adf4350_regs.cc \
db_boards.cc \
db_base.cc \
db_basic.cc \
db_boards.cc \
db_base.cc \
db_basic.cc \
+ db_bitshark_rx.cc \
db_tv_rx.cc \
db_tv_rx_mimo.cc \
db_flexrf.cc \
db_tv_rx.cc \
db_tv_rx_mimo.cc \
db_flexrf.cc \