summaryrefslogtreecommitdiff
path: root/gr-usrp/src/Makefile.am
diff options
context:
space:
mode:
authorjcorgan2006-08-06 04:31:17 +0000
committerjcorgan2006-08-06 04:31:17 +0000
commit951966ca64fc1ddd24889f6318c8c8794657cfba (patch)
tree610eb170a28db4cc195354594ad510bd7423593d /gr-usrp/src/Makefile.am
parentdb1b2f7c85600ffd108bd69a381505e0e7223a8a (diff)
downloadgnuradio-951966ca64fc1ddd24889f6318c8c8794657cfba.tar.gz
gnuradio-951966ca64fc1ddd24889f6318c8c8794657cfba.tar.bz2
gnuradio-951966ca64fc1ddd24889f6318c8c8794657cfba.zip
Partial fix for ticket 10 merged into trunk from
branches/developers/jcorgan/ticket-10 As of this merge the trunk and the above branch are identical. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-usrp/src/Makefile.am')
-rw-r--r--gr-usrp/src/Makefile.am12
1 files changed, 7 insertions, 5 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 611dd604d..4b502f5da 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -34,8 +34,7 @@ TESTS = run_tests
LOCAL_IFILES = \
usrp1.i
-NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+NON_LOCAL_IFILES = $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -60,9 +59,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 \
@@ -114,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
-