speechd-discuss
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/2] move audio source out of the modules directory


From: William Hubbs
Subject: [PATCH 1/2] move audio source out of the modules directory
Date: Wed, 16 Feb 2011 11:34:28 -0600

Since the audio plugins are independent of the modules now, we can move
the audio source directory outside of the modules directory.
---
 src/Makefile.am                     |    2 +-
 src/{modules => }/audio/.gitignore  |    0
 src/{modules => }/audio/Makefile.am |    0
 src/{modules => }/audio/alsa.c      |    0
 src/{modules => }/audio/libao.c     |    0
 src/{modules => }/audio/nas.c       |    0
 src/{modules => }/audio/oss.c       |    0
 src/{modules => }/audio/pulse.c     |    0
 src/modules/Makefile.am             |    2 --
 9 files changed, 1 insertions(+), 3 deletions(-)
 rename src/{modules => }/audio/.gitignore (100%)
 rename src/{modules => }/audio/Makefile.am (100%)
 rename src/{modules => }/audio/alsa.c (100%)
 rename src/{modules => }/audio/libao.c (100%)
 rename src/{modules => }/audio/nas.c (100%)
 rename src/{modules => }/audio/oss.c (100%)
 rename src/{modules => }/audio/pulse.c (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index f2da76d..81d0690 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS=common server modules api clients tests
+SUBDIRS=common server audio modules api clients tests
 
diff --git a/src/modules/audio/.gitignore b/src/audio/.gitignore
similarity index 100%
rename from src/modules/audio/.gitignore
rename to src/audio/.gitignore
diff --git a/src/modules/audio/Makefile.am b/src/audio/Makefile.am
similarity index 100%
rename from src/modules/audio/Makefile.am
rename to src/audio/Makefile.am
diff --git a/src/modules/audio/alsa.c b/src/audio/alsa.c
similarity index 100%
rename from src/modules/audio/alsa.c
rename to src/audio/alsa.c
diff --git a/src/modules/audio/libao.c b/src/audio/libao.c
similarity index 100%
rename from src/modules/audio/libao.c
rename to src/audio/libao.c
diff --git a/src/modules/audio/nas.c b/src/audio/nas.c
similarity index 100%
rename from src/modules/audio/nas.c
rename to src/audio/nas.c
diff --git a/src/modules/audio/oss.c b/src/audio/oss.c
similarity index 100%
rename from src/modules/audio/oss.c
rename to src/audio/oss.c
diff --git a/src/modules/audio/pulse.c b/src/audio/pulse.c
similarity index 100%
rename from src/modules/audio/pulse.c
rename to src/audio/pulse.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index f74b0a4..3588e53 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = audio
-
 inc_local = -I$(top_srcdir)/include
 audio_SOURCES = spd_audio.c spd_audio.h
 common_SOURCES = module_main.c module_utils.c module_utils.h
-- 
1.7.3.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]