diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-01-15 21:02:01 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-01-15 21:02:01 +0100 |
commit | c7fff97782bb59815e7ebd38895cc1480719e24c (patch) | |
tree | 9085026c9af6e0f969e7f0f71af6705b17e33cf8 | |
parent | bae221cca97816e0ae0395ac1e561aa208cb0346 (diff) |
move alsa and oss modules into their own subdirectories
-rw-r--r-- | src/Makefile.am | 16 | ||||
-rw-r--r-- | src/modules/alsa/alsa-util.c (renamed from src/modules/alsa-util.c) | 0 | ||||
-rw-r--r-- | src/modules/alsa/alsa-util.h (renamed from src/modules/alsa-util.h) | 0 | ||||
-rw-r--r-- | src/modules/alsa/module-alsa-sink.c (renamed from src/modules/module-alsa-sink.c) | 0 | ||||
-rw-r--r-- | src/modules/alsa/module-alsa-source.c (renamed from src/modules/module-alsa-source.c) | 0 | ||||
-rw-r--r-- | src/modules/oss/module-oss.c (renamed from src/modules/module-oss.c) | 0 | ||||
-rw-r--r-- | src/modules/oss/oss-util.c (renamed from src/modules/oss-util.c) | 0 | ||||
-rw-r--r-- | src/modules/oss/oss-util.h (renamed from src/modules/oss-util.h) | 0 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4b36f6f2..62df962e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1036,9 +1036,9 @@ SYMDEF_FILES = \ modules/module-x11-bell-symdef.h \ modules/module-x11-publish-symdef.h \ modules/module-x11-xsmp-symdef.h \ - modules/module-oss-symdef.h \ - modules/module-alsa-sink-symdef.h \ - modules/module-alsa-source-symdef.h \ + modules/oss/module-oss-symdef.h \ + modules/alsa/module-alsa-sink-symdef.h \ + modules/alsa/module-alsa-source-symdef.h \ modules/module-solaris-symdef.h \ modules/module-waveout-symdef.h \ modules/module-detect-symdef.h \ @@ -1232,27 +1232,27 @@ module_x11_xsmp_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINOR # OSS -liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h +liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h liboss_util_la_LDFLAGS = -avoid-version liboss_util_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la -module_oss_la_SOURCES = modules/module-oss.c +module_oss_la_SOURCES = modules/oss/module-oss.c module_oss_la_LDFLAGS = $(MODULE_LDFLAGS) module_oss_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la # ALSA -libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h +libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h libalsa_util_la_LDFLAGS = -avoid-version libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c +module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) -module_alsa_source_la_SOURCES = modules/module-alsa-source.c +module_alsa_source_la_SOURCES = modules/alsa/module-alsa-source.c module_alsa_source_la_LDFLAGS = $(MODULE_LDFLAGS) module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) diff --git a/src/modules/alsa-util.c b/src/modules/alsa/alsa-util.c index ff3af19d..ff3af19d 100644 --- a/src/modules/alsa-util.c +++ b/src/modules/alsa/alsa-util.c diff --git a/src/modules/alsa-util.h b/src/modules/alsa/alsa-util.h index 95bb983a..95bb983a 100644 --- a/src/modules/alsa-util.h +++ b/src/modules/alsa/alsa-util.h diff --git a/src/modules/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c index a3e818dd..a3e818dd 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/alsa/module-alsa-sink.c diff --git a/src/modules/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c index 901db01f..901db01f 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/alsa/module-alsa-source.c diff --git a/src/modules/module-oss.c b/src/modules/oss/module-oss.c index 23a32549..23a32549 100644 --- a/src/modules/module-oss.c +++ b/src/modules/oss/module-oss.c diff --git a/src/modules/oss-util.c b/src/modules/oss/oss-util.c index f766030d..f766030d 100644 --- a/src/modules/oss-util.c +++ b/src/modules/oss/oss-util.c diff --git a/src/modules/oss-util.h b/src/modules/oss/oss-util.h index 654f7bba..654f7bba 100644 --- a/src/modules/oss-util.h +++ b/src/modules/oss/oss-util.h |