diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 89 |
1 files changed, 60 insertions, 29 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dd9035b5..00dd53d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,13 +47,19 @@ endif AM_CFLAGS = \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ -I$(top_srcdir)/src/modules \ + -I$(top_builddir)/src/modules \ -I$(top_srcdir)/src/modules/rtp \ + -I$(top_builddir)/src/modules/rtp \ -I$(top_srcdir)/src/modules/gconf \ + -I$(top_builddir)/src/modules/gconf \ -I$(top_srcdir)/src/modules/bluetooth \ + -I$(top_builddir)/src/modules/bluetooth \ + -I$(top_srcdir)/src/modules/alsa \ + -I$(top_builddir)/src/modules/alsa \ -I$(top_srcdir)/src/modules/raop \ $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ - $(LTDLINCL) \ $(LIBSAMPLERATE_CFLAGS) \ $(LIBSNDFILE_CFLAGS) \ $(LIBSPEEX_CFLAGS) \ @@ -226,6 +232,7 @@ TESTS = \ strlist-test \ close-test \ voltest \ + vector-test \ memblockq-test \ channelmap-test \ thread-mainloop-test \ @@ -248,7 +255,7 @@ TESTS = \ lock-autospawn-test \ prioq-test -noinst_PROGRAMS = \ +TESTS_BINARIES = \ mainloop-test \ mcalign-test \ pacat-simple \ @@ -256,6 +263,7 @@ noinst_PROGRAMS = \ strlist-test \ close-test \ voltest \ + vector-test \ memblockq-test \ sync-playback \ interpol-test \ @@ -288,7 +296,7 @@ if HAVE_SIGXCPU #TESTS += \ # cpulimit-test \ # cpulimit-test2 -noinst_PROGRAMS += \ +TESTS_BINARIES += \ cpulimit-test \ cpulimit-test2 endif @@ -296,10 +304,16 @@ endif if HAVE_GLIB20 TESTS += \ mainloop-test-glib -noinst_PROGRAMS += \ +TESTS_BINARIES += \ mainloop-test-glib endif +if BUILD_TESTS_DEFAULT +noinst_PROGRAMS = $(TESTS_BINARIES) +else +check_PROGRAMS = $(TESTS_BINARIES) +endif + mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_LDADD = $(AM_LDADD) libpulse.la @@ -395,6 +409,11 @@ voltest_CFLAGS = $(AM_CFLAGS) voltest_LDADD = $(AM_LDADD) libpulse.la voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +vector_test_SOURCES = tests/vector-test.c +vector_test_CFLAGS = $(AM_CFLAGS) +vector_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la +vector_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + channelmap_test_SOURCES = tests/channelmap-test.c channelmap_test_CFLAGS = $(AM_CFLAGS) channelmap_test_LDADD = $(AM_LDADD) libpulse.la @@ -514,7 +533,8 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES = \ pulsecore/llist.h \ pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \ pulsecore/log.c pulsecore/log.h \ - pulsecore/macro.h \ + pulsecore/ratelimit.c pulsecore/ratelimit.h \ + pulsecore/macro.h pulsecore/vector.h \ pulsecore/mcalign.c pulsecore/mcalign.h \ pulsecore/memblock.c pulsecore/memblock.h \ pulsecore/memblockq.c pulsecore/memblockq.h \ @@ -536,6 +556,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES = \ pulsecore/refcnt.h \ pulsecore/rtclock.c pulsecore/rtclock.h \ pulsecore/shm.c pulsecore/shm.h \ + pulsecore/bitset.c pulsecore/bitset.h \ pulsecore/socket-client.c pulsecore/socket-client.h \ pulsecore/socket-server.c pulsecore/socket-server.h \ pulsecore/socket-util.c pulsecore/socket-util.h \ @@ -712,10 +733,10 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \ pulsecore/asyncmsgq.c pulsecore/asyncmsgq.h \ pulsecore/asyncq.c pulsecore/asyncq.h \ pulsecore/auth-cookie.c pulsecore/auth-cookie.h \ - pulsecore/autoload.c pulsecore/autoload.h \ pulsecore/cli-command.c pulsecore/cli-command.h \ pulsecore/cli-text.c pulsecore/cli-text.h \ pulsecore/client.c pulsecore/client.h \ + pulsecore/card.c pulsecore/card.h \ pulsecore/core-scache.c pulsecore/core-scache.h \ pulsecore/core-subscribe.c pulsecore/core-subscribe.h \ pulsecore/core.c pulsecore/core.h \ @@ -801,7 +822,7 @@ libcli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecom libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h libprotocol_cli_la_LDFLAGS = -avoid-version -libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libcli.la libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h libprotocol_http_la_LDFLAGS = -avoid-version @@ -842,7 +863,6 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN ################################### modlibexec_LTLIBRARIES += \ - module-flat-volume.la \ module-cli.la \ module-cli-protocol-tcp.la \ module-simple-protocol-tcp.la \ @@ -852,6 +872,7 @@ modlibexec_LTLIBRARIES += \ module-volume-restore.la \ module-device-restore.la \ module-stream-restore.la \ + module-card-restore.la \ module-default-device-restore.la \ module-always-sink.la \ module-rescue-streams.la \ @@ -920,7 +941,8 @@ if HAVE_ALSA modlibexec_LTLIBRARIES += \ libalsa-util.la \ module-alsa-sink.la \ - module-alsa-source.la + module-alsa-source.la \ + module-alsa-card.la endif if HAVE_SOLARIS @@ -1036,9 +1058,10 @@ 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/alsa/module-alsa-card-symdef.h \ modules/module-solaris-symdef.h \ modules/module-waveout-symdef.h \ modules/module-detect-symdef.h \ @@ -1049,6 +1072,7 @@ SYMDEF_FILES = \ modules/module-volume-restore-symdef.h \ modules/module-device-restore-symdef.h \ modules/module-stream-restore-symdef.h \ + modules/module-card-restore-symdef.h \ modules/module-default-device-restore-symdef.h \ modules/module-always-sink-symdef.h \ modules/module-rescue-streams-symdef.h \ @@ -1061,25 +1085,15 @@ SYMDEF_FILES = \ modules/module-raop-discover-symdef.h \ modules/gconf/module-gconf-symdef.h \ modules/module-position-event-sounds-symdef.h \ - modules/module-console-kit-symdef.h \ - modules/module-flat-volume-symdef.h + modules/module-console-kit-symdef.h EXTRA_DIST += $(SYMDEF_FILES) BUILT_SOURCES += $(SYMDEF_FILES) $(SYMDEF_FILES): modules/module-defs.h.m4 - $(MKDIR_P) modules - $(MKDIR_P) modules/gconf - $(MKDIR_P) modules/rtp - $(MKDIR_P) modules/bluetooth + $(MKDIR_P) $(dir $@) $(M4) -Dfname="$@" $< > $@ -# Flat volume - -module_flat_volume_la_SOURCES = modules/module-flat-volume.c -module_flat_volume_la_LDFLAGS = $(MODULE_LDFLAGS) -module_flat_volume_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la - # Simple protocol module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c @@ -1232,31 +1246,42 @@ 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 modules/alsa/alsa-sink.c modules/alsa/alsa-sink.h modules/alsa/alsa-source.c modules/alsa/alsa-source.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 +if HAVE_HAL +libalsa_util_la_SOURCES += modules/hal-util.h modules/hal-util.c +libalsa_util_la_LIBADD += $(HAL_LIBS) libdbus-util.la +libalsa_util_la_CFLAGS += $(HAL_CFLAGS) +endif + +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) +module_alsa_card_la_SOURCES = modules/alsa/module-alsa-card.c +module_alsa_card_la_LDFLAGS = $(MODULE_LDFLAGS) +module_alsa_card_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +module_alsa_card_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) + # Solaris module_solaris_la_SOURCES = modules/module-solaris.c @@ -1326,6 +1351,12 @@ module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS) module_stream_restore_la_LIBADD = $(AM_LIBADD) libprotocol-native.la libpulsecore-@PA_MAJORMINORMICRO@.la -lgdbm libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_stream_restore_la_CFLAGS = $(AM_CFLAGS) +# Card profile restore module +module_card_restore_la_SOURCES = modules/module-card-restore.c +module_card_restore_la_LDFLAGS = $(MODULE_LDFLAGS) +module_card_restore_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la -lgdbm libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +module_card_restore_la_CFLAGS = $(AM_CFLAGS) + # Default sink/source restore module module_default_device_restore_la_SOURCES = modules/module-default-device-restore.c module_default_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS) |