diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-09-05 20:18:28 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-09-05 20:18:28 +0000 |
| commit | 73b85d7840a0694b9deafc75e081dd67cb935169 (patch) | |
| tree | c8d4f6c40275bf2c7d9fd7e35604b719d80ad62a /Makefile.common | |
| parent | bdae13c6aae7a5190e25dfb41e546382e9c6def3 (diff) | |
Merged eb/usrp-la r6317:6320 into trunk. This deborks the dependency
on usrp-inband that was introduced in [6307].
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6321 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 33a3a7c2a8..fd14144b39 100644 --- a/Makefile.common +++ b/Makefile.common @@ -74,11 +74,12 @@ GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i # How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib/legacy \ - -I$(top_srcdir)/usrp/host/lib/inband \ -I$(top_srcdir)/usrp/firmware/include -USRP_LA = \ - $(top_builddir)/usrp/host/lib/legacy/libusrp.la \ - $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la +USRP_LA = $(top_builddir)/usrp/host/lib/legacy/libusrp.la + +# How to link in usrp-inband library from inside the tree +USRP_INBAND_INCLUDES = -I$(top_srcdir)/usrp/host/lib/inband +USRP_INBAND_LA = $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la # How to link the PMT library from inside the tree PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib |