projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made changes, such that:
[debian/gnuradio]
/
gr-usrp
/
src
/
Makefile.am
diff --git
a/gr-usrp/src/Makefile.am
b/gr-usrp/src/Makefile.am
index 4b502f5daa7d6d791379f1956e88f831eb094270..2ae596b7b4a4958e619b5eed2ad309582a0cf7e3 100644
(file)
--- a/
gr-usrp/src/Makefile.am
+++ b/
gr-usrp/src/Makefile.am
@@
-5,7
+5,7
@@
#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version
2
, or (at your option)
+# the Free Software Foundation; either version
3
, or (at your option)
# any later version.
#
# GNU Radio is distributed in the hope that it will be useful,
# any later version.
#
# GNU Radio is distributed in the hope that it will be useful,
@@
-15,8
+15,8
@@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# the Free Software Foundation, Inc., 5
1 Franklin Street
,
+# Boston, MA 0211
0-1301
, USA.
#
include $(top_srcdir)/Makefile.common
#
include $(top_srcdir)/Makefile.common
@@
-32,7
+32,7
@@
EXTRA_DIST = run_tests.in
TESTS = run_tests
LOCAL_IFILES = \
TESTS = run_tests
LOCAL_IFILES = \
- usrp1.i
+ $(top_srcdir)/gr-usrp/src/usrp1.i
NON_LOCAL_IFILES = $(GNURADIO_I)
NON_LOCAL_IFILES = $(GNURADIO_I)
@@
-50,6
+50,7
@@
ourpython_PYTHON = \
db_dbs_rx.py \
db_flexrf.py \
db_flexrf_mimo.py \
db_dbs_rx.py \
db_flexrf.py \
db_flexrf_mimo.py \
+ db_wbx.py \
db_instantiator.py \
db_tv_rx.py \
flexrf_debug_gui.py \
db_instantiator.py \
db_tv_rx.py \
flexrf_debug_gui.py \
@@
-94,16
+95,16
@@
_usrp1_la_SOURCES = \
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_L
IBS)
\
- $(USRP_L
IBS)
\
+ $(GNURADIO_CORE_L
A)
\
+ $(USRP_L
A)
\
-lstdc++
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-lstdc++
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $
<
+usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
$(LOCAL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $
(LOCAL_IFILES)
noinst_PYTHON = \
noinst_PYTHON = \