Updated FSF address in all files. Fixes ticket:51

[debian/gnuradio] / gr-usrp / src / Makefile.am

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index ecec8b9f040298bdb58b0855687dfcec87a1270a..8645ca5294a84ad9895558207003550b6b4bcd35 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -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)                 \
@@ -60,12 +59,13 @@ ourpython_PYTHON =                  \
         usrp_multi.py                  
 
 
-USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include
-USRP_LIBS = -L$(top_srcdir)/usrp/host/lib -lusrp
+INCLUDES = $(STD_DEFINES_AND_INCLUDES)  \
+          $(PYTHON_CPPFLAGS)           \
+          $(USRP_INCLUDES)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) 
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(USRP_INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS)         \
+                $(STD_DEFINES_AND_INCLUDES) \
+                $(USRP_INCLUDES)
 
 grinclude_HEADERS =                    \
        usrp1_sink_base.h               \
@@ -102,8 +102,8 @@ _usrp1_la_LIBADD =                  \
 _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 =                                \
@@ -117,4 +117,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
-