diff options
| author | eb | 2007-09-05 20:18:28 +0000 |
|---|---|---|
| committer | eb | 2007-09-05 20:18:28 +0000 |
| commit | 73b85d7840a0694b9deafc75e081dd67cb935169 (patch) | |
| tree | c8d4f6c40275bf2c7d9fd7e35604b719d80ad62a /usrp/host/lib/inband | |
| parent | bdae13c6aae7a5190e25dfb41e546382e9c6def3 (diff) | |
| download | gnuradio-73b85d7840a0694b9deafc75e081dd67cb935169.tar.gz gnuradio-73b85d7840a0694b9deafc75e081dd67cb935169.tar.bz2 gnuradio-73b85d7840a0694b9deafc75e081dd67cb935169.zip | |
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 'usrp/host/lib/inband')
| -rw-r--r-- | usrp/host/lib/inband/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am index 76e769fbe..d0daf45c3 100644 --- a/usrp/host/lib/inband/Makefile.am +++ b/usrp/host/lib/inband/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common INCLUDES = \ $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \ $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \ - -I$(srcdir)/../../apps + -I$(srcdir)/../../apps-inband TESTS = test_inband @@ -52,7 +52,7 @@ usrp_interface_mbh.cc : usrp_interface.mbh libusrp_inband_la_SOURCES = \ $(BUILT_SOURCES) \ - ../../apps/ui_sincos.c \ + $(srcdir)/../../apps-inband/ui_sincos.c \ usrp_inband_usb_packet.cc \ usrp_rx.cc \ usrp_rx_stub.cc \ @@ -65,7 +65,7 @@ libusrp_inband_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 libusrp_inband_la_LIBADD = \ $(MBLOCK_LA) \ - ../legacy/libusrp.la \ + $(USRP_LA) \ -lstdc++ include_HEADERS = \ @@ -103,12 +103,9 @@ libusrp_inband_qa_la_SOURCES = \ # magic flags libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version -# link against c++ standard library libusrp_inband_qa_la_LIBADD = \ libusrp_inband.la \ $(CPPUNIT_LIBS) \ - ../legacy/libusrp.la \ - libusrp_inband.la \ -lstdc++ # ------------------------------------------------------------------------ |