diff options
| author | jcorgan | 2008-11-03 20:08:39 +0000 |
|---|---|---|
| committer | jcorgan | 2008-11-03 20:08:39 +0000 |
| commit | 7ea75f891baabf0612f09e14353552bd33413dc8 (patch) | |
| tree | 4d1471e49e3ea8d2189979920b41840849026c19 /usrp/host | |
| parent | fd5782d6940b262c3db553c6ba6afcf78954a4fa (diff) | |
| download | gnuradio-7ea75f891baabf0612f09e14353552bd33413dc8.tar.gz gnuradio-7ea75f891baabf0612f09e14353552bd33413dc8.tar.bz2 gnuradio-7ea75f891baabf0612f09e14353552bd33413dc8.zip | |
Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu packaging system to build trunk code on Ubuntu 8.10.
Several new trunk components still need debs created.
Impact on non-packaging code:
* Renamed libgr_audio_alsa.so to libgnuradio-audio-alsa.so
* Renamed libusrp_inband.so to libusrp-inband.so
* Added PYTHON_CHECK_MODULE to build system to simplify Python dependency verification
Packaging code updates:
* Updated build-depends and package dependencies to be current with trunk
* Added package for libgruel and libgruel-dev
* Renamed library packages to use simplified names, removing the 0 or 0c2a suffix. This may not follow Debian policy, but we can revisit this if we ever go into official Debian or Ubuntu.
* Remove gr-comedi from packaging
* Restructured sections to eliminate 'contrib'. Since we're not official Debian, we don't need to deal with the sdcc-nf issue.
* Consolidated usrp firmware packages into corresponding main packages (same as previous).
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9918 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host')
| -rw-r--r-- | usrp/host/lib/inband/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am index 447d0a61d..ca9009f54 100644 --- a/usrp/host/lib/inband/Makefile.am +++ b/usrp/host/lib/inband/Makefile.am @@ -32,8 +32,8 @@ EXTRA_DIST = \ usrp_interface.mbh lib_LTLIBRARIES = \ - libusrp_inband.la \ - libusrp_inband-qa.la + libusrp-inband.la \ + libusrp-inband-qa.la # ------------------------------------------------------------------------ # Build the inband library @@ -100,7 +100,7 @@ libusrp_inband_qa_la_SOURCES = \ libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version libusrp_inband_qa_la_LIBADD = \ - libusrp_inband.la \ + libusrp-inband.la \ $(PMT_LA) \ $(CPPUNIT_LIBS) \ -lstdc++ @@ -111,7 +111,7 @@ noinst_PROGRAMS = \ test_inband test_inband_SOURCES = test_inband.cc -test_inband_LDADD = libusrp_inband-qa.la +test_inband_LDADD = libusrp-inband-qa.la MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc |