summaryrefslogtreecommitdiff
path: root/usrp/firmware
diff options
context:
space:
mode:
authorjcorgan2006-08-07 15:41:19 +0000
committerjcorgan2006-08-07 15:41:19 +0000
commite27ba9aebfddf88cd245636d2f652a4ee4e289ec (patch)
tree01f44251578419823c34f140ee58d8fc6016a1c2 /usrp/firmware
parent37bee553f670da9c82b5a438fe06df3a1ca8b2aa (diff)
downloadgnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.gz
gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.bz2
gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.zip
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now successfully completes on a machine that has never had gnuradio installed before. In addition, several cleanups and refactoring of build system code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and gr-audio-windows have not been fully tested and will need verification by the maintainers of these components. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/firmware')
-rw-r--r--usrp/firmware/src/usrp2/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
index e708312d9..41664a2da 100644
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ b/usrp/firmware/src/usrp2/Makefile.am
@@ -54,7 +54,10 @@ EXTRA_DIST = \
DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include -I$(top_srcdir)/usrp/firmware/src/usrp2 -I$(top_srcdir)/usrp/firmware/src/common -I./ -I../common
+INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+ -I$(top_srcdir)/usrp/firmware/src/usrp2 \
+ -I$(top_srcdir)/usrp/firmware/src/common \
+ -I$(top_builddir)/usrp/firmware/src/common
# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
# on chip. This memory is mapped like this: