summaryrefslogtreecommitdiff
path: root/config/grc_gr_audio.m4
diff options
context:
space:
mode:
authorJosh Blum2011-10-11 21:35:35 -0700
committerJosh Blum2011-10-11 21:35:35 -0700
commit1259a01a9479071bd1729a9c9496444f0a72509b (patch)
tree55350454454a119fb230cdbaadfb27d361f191ec /config/grc_gr_audio.m4
parent71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff)
parent06860c309153890a6a42babfbedf230eb24f0042 (diff)
downloadgnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz
gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2
gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts: gr-digital/include/digital_constellation.h
Diffstat (limited to 'config/grc_gr_audio.m4')
-rw-r--r--config/grc_gr_audio.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
index 92a0440d0..0e881671a 100644
--- a/config/grc_gr_audio.m4
+++ b/config/grc_gr_audio.m4
@@ -108,6 +108,7 @@ AC_DEFUN([GRC_GR_AUDIO],[
gr-audio/include/Makefile \
gr-audio/lib/Makefile \
gr-audio/swig/Makefile \
+ gr-audio/doc/Makefile \
gr-audio/gnuradio-audio.pc \
])