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 611dd604d9568f060e090eaa236c2039ef0a7b78..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
-# 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,
@@ -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
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
 include $(top_srcdir)/Makefile.common
@@ -32,10 +32,9 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       usrp1.i                         
+       $(top_srcdir)/gr-usrp/src/usrp1.i                               
 
-NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+NON_LOCAL_IFILES = $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -51,6 +50,7 @@ ourpython_PYTHON =                    \
        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             \
@@ -60,9 +60,13 @@ ourpython_PYTHON =                   \
         usrp_multi.py                  
 
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(USRP_INCLUDES)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES)  \
+          $(PYTHON_CPPFLAGS)           \
+          $(USRP_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(USRP_INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS)         \
+                $(STD_DEFINES_AND_INCLUDES) \
+                $(USRP_INCLUDES)
 
 grinclude_HEADERS =                    \
        usrp1_sink_base.h               \
@@ -91,16 +95,16 @@ _usrp1_la_SOURCES =                         \
 
 _usrp1_la_LIBADD =                     \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
-       $(USRP_LIBS)                    \
+       $(GNURADIO_CORE_LA)             \
+       $(USRP_LA)                      \
        -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 =                                \
@@ -114,4 +118,3 @@ MOSTLYCLEANFILES = \
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
        @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
-