summaryrefslogtreecommitdiff
path: root/gr-audio-alsa/src
diff options
context:
space:
mode:
authorjcorgan2006-12-12 20:00:39 +0000
committerjcorgan2006-12-12 20:00:39 +0000
commit76ed4c2fea5f59bfe02bbbb17754ef7eda44feca (patch)
treec30952925ea02e52f137e1e7f4da658629994936 /gr-audio-alsa/src
parent5de36fac220305307d6fb64eabe6f417a26c0982 (diff)
downloadgnuradio-76ed4c2fea5f59bfe02bbbb17754ef7eda44feca.tar.gz
gnuradio-76ed4c2fea5f59bfe02bbbb17754ef7eda44feca.tar.bz2
gnuradio-76ed4c2fea5f59bfe02bbbb17754ef7eda44feca.zip
Merge jcorgan/hier developer branch into trunk. Enables creation of true hierarchical blocks, from either C++ or Python, as well as creating pure C++ gnuradio applications. EXPERIMENTAL.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4070 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-audio-alsa/src')
-rw-r--r--gr-audio-alsa/src/Makefile.am12
1 files changed, 11 insertions, 1 deletions
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index 0f165a0dc..f9b69c78f 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -55,8 +55,12 @@ SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
ourlib_LTLIBRARIES = _audio_alsa.la
+lib_LTLIBRARIES = libgr_audio_alsa.la
+
_audio_alsa_la_SOURCES = \
- audio_alsa.cc \
+ audio_alsa.cc
+
+libgr_audio_alsa_la_SOURCES = \
audio_alsa_sink.cc \
audio_alsa_source.cc \
gri_alsa.cc
@@ -76,10 +80,16 @@ _audio_alsa_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LIBS) \
$(ALSA_LIBS) \
+ libgr_audio_alsa.la \
-lstdc++
+libgr_audio_alsa_la_LIBADD = \
+ $(ALSA_LIBS)
+
_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+
audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
$(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc $(LOCAL_IFILES)