diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-11-03 20:08:39 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-11-03 20:08:39 +0000 |
| commit | 7ea75f891baabf0612f09e14353552bd33413dc8 (patch) | |
| tree | 4d1471e49e3ea8d2189979920b41840849026c19 /gr-audio-alsa/src | |
| parent | fd5782d6940b262c3db553c6ba6afcf78954a4fa (diff) | |
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 'gr-audio-alsa/src')
| -rw-r--r-- | gr-audio-alsa/src/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index 742af80b56..90b47e9d35 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -56,12 +56,12 @@ SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ ourlib_LTLIBRARIES = _audio_alsa.la -lib_LTLIBRARIES = libgr_audio_alsa.la +lib_LTLIBRARIES = libgnuradio-audio-alsa.la _audio_alsa_la_SOURCES = \ audio_alsa.cc -libgr_audio_alsa_la_SOURCES = \ +libgnuradio_audio_alsa_la_SOURCES = \ audio_alsa_sink.cc \ audio_alsa_source.cc \ gri_alsa.cc @@ -80,15 +80,15 @@ _audio_alsa_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) \ - libgr_audio_alsa.la \ + libgnuradio-audio-alsa.la \ -lstdc++ -libgr_audio_alsa_la_LIBADD = \ +libgnuradio_audio_alsa_la_LIBADD = \ $(ALSA_LIBS) _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) +libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) _audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@ |