From b9b5318101d596b8f06cf5640ddceb90bdb9235c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 8 Mar 2011 23:13:13 -0800
Subject: audio: skeleton for gr-audio component

---
 gr-audio/Makefile.am | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 gr-audio/Makefile.am

(limited to 'gr-audio/Makefile.am')

diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
new file mode 100644
index 000000000..092d9b980
--- /dev/null
+++ b/gr-audio/Makefile.am
@@ -0,0 +1,29 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = include lib
+
+if PYTHON
+SUBDIRS += swig
+endif
+
-- 
cgit 


From 77da72f511647d458b62ffefaa94662b78d7f7d3 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 00:52:55 -0800
Subject: audio: added audio factory registry and top level includes

---
 gr-audio/Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gr-audio/Makefile.am')

diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index 092d9b980..65cb397ca 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -27,3 +27,8 @@ if PYTHON
 SUBDIRS += swig
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio.pc
+
+etcdir = $(gr_prefsdir)
+dist_etc_DATA = gr-audio.conf
-- 
cgit 


From 24d30ff306a906b21ad724c07a95caed24659887 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 10:29:53 -0800
Subject: audio: work to get alsa support in, lets see if this works before
 adding more

---
 gr-audio/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gr-audio/Makefile.am')

diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index 65cb397ca..33d2946ba 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -29,6 +29,3 @@ endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-audio.pc
-
-etcdir = $(gr_prefsdir)
-dist_etc_DATA = gr-audio.conf
-- 
cgit 


From 0644b009591f4c63ed05a8095a0c54c1501bac71 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Mar 2011 11:44:35 -0800
Subject: audio: moved the grc audio blocks into gr-audio dir

---
 gr-audio/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-audio/Makefile.am')

diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index 33d2946ba..bb0d05d07 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common
 SUBDIRS = include lib
 
 if PYTHON
-SUBDIRS += swig
+SUBDIRS += grc swig
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-- 
cgit