From: Lennart Poettering Date: Tue, 28 Apr 2009 00:29:01 +0000 (+0200) Subject: build-system: move x11 and jack modules into subdirectories X-Git-Tag: submit/2.0-panda/20130828.192557~1856 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0368d6e22b9d7e6fec2474d158eaec16c90054f5;p=profile%2Fivi%2Fpulseaudio-panda.git build-system: move x11 and jack modules into subdirectories --- diff --git a/src/Makefile.am b/src/Makefile.am index 68b42df..719f9dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1115,10 +1115,10 @@ SYMDEF_FILES = \ modules/module-mmkbd-evdev-symdef.h \ modules/module-http-protocol-tcp-symdef.h \ modules/module-http-protocol-unix-symdef.h \ - modules/module-x11-bell-symdef.h \ - modules/module-x11-publish-symdef.h \ - modules/module-x11-xsmp-symdef.h \ - modules/module-x11-cork-request-symdef.h \ + modules/x11/module-x11-bell-symdef.h \ + modules/x11/module-x11-publish-symdef.h \ + modules/x11/module-x11-xsmp-symdef.h \ + modules/x11/module-x11-cork-request-symdef.h \ modules/oss/module-oss-symdef.h \ modules/alsa/module-alsa-sink-symdef.h \ modules/alsa/module-alsa-source-symdef.h \ @@ -1128,8 +1128,8 @@ SYMDEF_FILES = \ modules/module-detect-symdef.h \ modules/rtp/module-rtp-send-symdef.h \ modules/rtp/module-rtp-recv-symdef.h \ - modules/module-jack-sink-symdef.h \ - modules/module-jack-source-symdef.h \ + modules/jack/module-jack-sink-symdef.h \ + modules/jack/module-jack-source-symdef.h \ modules/module-volume-restore-symdef.h \ modules/module-device-restore-symdef.h \ modules/module-stream-restore-symdef.h \ @@ -1292,22 +1292,22 @@ module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@. # X11 -module_x11_bell_la_SOURCES = modules/module-x11-bell.c +module_x11_bell_la_SOURCES = modules/x11/module-x11-bell.c module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) module_x11_bell_la_LDFLAGS = $(MODULE_LDFLAGS) module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la -module_x11_publish_la_SOURCES = modules/module-x11-publish.c +module_x11_publish_la_SOURCES = modules/x11/module-x11-publish.c module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) module_x11_publish_la_LDFLAGS = $(MODULE_LDFLAGS) module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libprotocol-native.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la -module_x11_xsmp_la_SOURCES = modules/module-x11-xsmp.c +module_x11_xsmp_la_SOURCES = modules/x11/module-x11-xsmp.c module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) module_x11_xsmp_la_LDFLAGS = $(MODULE_LDFLAGS) module_x11_xsmp_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la -module_x11_cork_request_la_SOURCES = modules/module-x11-cork-request.c +module_x11_cork_request_la_SOURCES = modules/x11/module-x11-cork-request.c module_x11_cork_request_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) module_x11_cork_request_la_LDFLAGS = $(MODULE_LDFLAGS) module_x11_cork_request_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la @@ -1487,12 +1487,12 @@ module_rtp_recv_la_CFLAGS = $(AM_CFLAGS) # JACK -module_jack_sink_la_SOURCES = modules/module-jack-sink.c +module_jack_sink_la_SOURCES = modules/jack/module-jack-sink.c module_jack_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_jack_sink_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la $(JACK_LIBS) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_jack_sink_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) -module_jack_source_la_SOURCES = modules/module-jack-source.c +module_jack_source_la_SOURCES = modules/jack/module-jack-source.c module_jack_source_la_LDFLAGS = $(MODULE_LDFLAGS) module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la $(JACK_LIBS) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) diff --git a/src/modules/module-jack-sink.c b/src/modules/jack/module-jack-sink.c similarity index 100% rename from src/modules/module-jack-sink.c rename to src/modules/jack/module-jack-sink.c diff --git a/src/modules/module-jack-source.c b/src/modules/jack/module-jack-source.c similarity index 100% rename from src/modules/module-jack-source.c rename to src/modules/jack/module-jack-source.c diff --git a/src/modules/module-x11-bell.c b/src/modules/x11/module-x11-bell.c similarity index 100% rename from src/modules/module-x11-bell.c rename to src/modules/x11/module-x11-bell.c diff --git a/src/modules/module-x11-cork-request.c b/src/modules/x11/module-x11-cork-request.c similarity index 100% rename from src/modules/module-x11-cork-request.c rename to src/modules/x11/module-x11-cork-request.c diff --git a/src/modules/module-x11-publish.c b/src/modules/x11/module-x11-publish.c similarity index 100% rename from src/modules/module-x11-publish.c rename to src/modules/x11/module-x11-publish.c diff --git a/src/modules/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c similarity index 100% rename from src/modules/module-x11-xsmp.c rename to src/modules/x11/module-x11-xsmp.c