From 181e9c6d5d11cb1e5d36a2777eeb233ad8ed00e5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 9 Oct 2008 18:15:23 +0200 Subject: big pile of updates to match more what happened with libcanberra --- src/Makefile.am | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 264 insertions(+), 16 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 522b4f4..9a6107e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,9 +16,10 @@ # License along with libsydney. If not, see # . -AM_CFLAGS = $(PTHREAD_CFLAGS) +plugindir = $(libdir)/libsydney-@PACKAGE_VERSION@ + +AM_CFLAGS = $(PTHREAD_CFLAGS) -DSA_PLUGIN_PATH=\"$(plugindir)\" AM_CXXFLAGS = $(PTHREAD_CFLAGS) -AM_LIBADD = $(PTHREAD_LIBS) AM_LDADD = $(PTHREAD_LIBS) EXTRA_DIST = \ @@ -35,13 +36,13 @@ noinst_PROGRAMS = \ test-llist \ test-sine \ test-pull -# test-asyncq libsydney_la_SOURCES = \ sydney.h \ common.c common.h \ malloc.c malloc.h \ - oss.c oss.h \ + macro.c macro.h \ + llist.h \ bbuffer.c bbuffer.h \ format.c fomat.h \ volscale.c volscale.h \ @@ -55,16 +56,269 @@ libsydney_la_SOURCES = \ g711.c g711.h \ mutex-posix.c mutex.h \ thread-posix.c thread.h \ - bufferq.c buffer.h -# asyncq.c asyncq.h + bufferq.c buffer.h \ + proplist.c proplist.h \ + driver.h +libsydney_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBOIL_CFLAGS) \ + $(SPEEX_CFLAGS) libsydney_la_LIBADD = \ $(AM_LIBADD) \ $(LIBOIL_LIBS) \ $(SPEEX_LIBS) -libsydney_la_CXXFLAGS = \ - $(AM_CXXFLAGS) \ - $(LIBOIL_CFLAGS) \ - $(SPEEX_CFLAGS) +libsydney_la_LDFLAGS = \ + -export-dynamic \ + -version-info $(LIBSYDNEY_VERSION_INFO) + +if USE_VERSION_SCRIPT +libsydney_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file +endif + +plugin_LTLIBRARIES = + +if BUILTIN_DSO + +libsydney_la_SOURCES += \ + dso.c \ + driver-order.c driver-order.h +libsydney_la_CFLAGS += \ + $(LTDLINCL) +libsydney_la_LIBADD += \ + $(LIBLTDL) + +endif + +if HAVE_ALSA +if BUILTIN_ALSA + +libsydney_la_SOURCES += \ + alsa.c +libsydney_la_CFLAGS += \ + $(ALSA_CFLAGS) +libsydney_la_LIBADD += \ + $(ALSA_LIBS) + +else + +plugin_LTLIBRARIES += \ + libsydney-alsa.la + +libsydney_alsa_la_SOURCES = \ + alsa.c +libsydney_alsa_la_CFLAGS = \ + $(ALSA_CFLAGS) \ + -Ddriver_open=alsa_driver_open \ + -Ddriver_destroy=alsa_driver_destroy \ + -Ddriver_change_write_latency=alsa_driver_change_write_latency \ + -Ddriver_change_read_latency=alsa_driver_change_read_latency \ + -Ddriver_change_device=alsa_driver_change_device \ + -Ddriver_change_read_volume=alsa_driver_change_read_volume \ + -Ddriver_change_write_volume=alsa_driver_change_write_volume \ + -Ddriver_change_pcm_rate=alsa_driver_change_pcm_rate \ + -Ddriver_change_props=alsa_driver_change_props \ + -Ddriver_get_state=alsa_driver_get_state \ + -Ddriver_get_position=alsa_driver_get_position \ + -Ddriver_wait=alsa_driver_wait \ + -Ddriver_read=alsa_driver_read \ + -Ddriver_read_ni=alsa_driver_read_ni \ + -Ddriver_pwrite=alsa_driver_pwrite \ + -Ddriver_pwrite_ni=alsa_driver_pwrite_ni \ + -Ddriver_get_read_size=alsa_driver_get_read_size \ + -Ddriver_get_write_size=alsa_driver_get_write_size \ + -Ddriver_resume=alsa_driver_resume \ + -Ddriver_pause=alsa_driver_pause \ + -Ddriver_drain=alsa_driver_drain +libsydney_alsa_la_LIBADD = \ + $(ALSA_LIBS) \ + libsydney.la +libsydney_alsa_la_LDFLAGS = \ + -avoid-version -module -export-dynamic + +endif +endif + +if HAVE_OSS +if BUILTIN_OSS + +libsydney_la_SOURCES += \ + oss.c + +else + +plugin_LTLIBRARIES += \ + libsydney-oss.la + +libsydney_oss_la_SOURCES = \ + oss.c +libsydney_oss_la_CFLAGS = \ + -Ddriver_open=oss_driver_open \ + -Ddriver_destroy=oss_driver_destroy \ + -Ddriver_change_write_latency=oss_driver_change_write_latency \ + -Ddriver_change_read_latency=oss_driver_change_read_latency \ + -Ddriver_change_device=oss_driver_change_device \ + -Ddriver_change_read_volume=oss_driver_change_read_volume \ + -Ddriver_change_write_volume=oss_driver_change_write_volume \ + -Ddriver_change_pcm_rate=oss_driver_change_pcm_rate \ + -Ddriver_change_props=oss_driver_change_props \ + -Ddriver_get_state=oss_driver_get_state \ + -Ddriver_get_position=oss_driver_get_position \ + -Ddriver_wait=oss_driver_wait \ + -Ddriver_read=oss_driver_read \ + -Ddriver_read_ni=oss_driver_read_ni \ + -Ddriver_pwrite=oss_driver_pwrite \ + -Ddriver_pwrite_ni=oss_driver_pwrite_ni \ + -Ddriver_get_read_size=oss_driver_get_read_size \ + -Ddriver_get_write_size=oss_driver_get_write_size \ + -Ddriver_resume=oss_driver_resume \ + -Ddriver_pause=oss_driver_pause \ + -Ddriver_drain=oss_driver_drain +libsydney_oss_la_LIBADD = \ + libsydney.la +libsydney_oss_la_LDFLAGS = \ + -avoid-version -module -export-dynamic +endif +endif + +if HAVE_PULSE +if BUILTIN_PULSE + +libsydney_la_SOURCES += \ + pulse.c +libsydney_la_CFLAGS += \ + $(PULSE_CFLAGS) +libsydney_la_LIBADD += \ + $(PULSE_LIBS) + +else + +plugin_LTLIBRARIES += \ + libsydney-pulse.la + +libsydney_pulse_la_SOURCES = \ + pulse.c +libsydney_pulse_la_CFLAGS = \ + $(PULSE_CFLAGS) \ + -Ddriver_open=pulse_driver_open \ + -Ddriver_destroy=pulse_driver_destroy \ + -Ddriver_change_write_latency=pulse_driver_change_write_latency \ + -Ddriver_change_read_latency=pulse_driver_change_read_latency \ + -Ddriver_change_device=pulse_driver_change_device \ + -Ddriver_change_read_volume=pulse_driver_change_read_volume \ + -Ddriver_change_write_volume=pulse_driver_change_write_volume \ + -Ddriver_change_pcm_rate=pulse_driver_change_pcm_rate \ + -Ddriver_change_props=pulse_driver_change_props \ + -Ddriver_get_state=pulse_driver_get_state \ + -Ddriver_get_position=pulse_driver_get_position \ + -Ddriver_wait=pulse_driver_wait \ + -Ddriver_read=pulse_driver_read \ + -Ddriver_read_ni=pulse_driver_read_ni \ + -Ddriver_pwrite=pulse_driver_pwrite \ + -Ddriver_pwrite_ni=pulse_driver_pwrite_ni \ + -Ddriver_get_read_size=pulse_driver_get_read_size \ + -Ddriver_get_write_size=pulse_driver_get_write_size \ + -Ddriver_resume=pulse_driver_resume \ + -Ddriver_pause=pulse_driver_pause \ + -Ddriver_drain=pulse_driver_drain +libsydney_pulse_la_LIBADD = \ + $(PULSE_LIBS) \ + libsydney.la +libsydney_pulse_la_LDFLAGS = \ + -avoid-version -module -export-dynamic + +endif +endif + +if HAVE_JACK +if BUILTIN_JACK + +libsydney_la_SOURCES += \ + jack.c +libsydney_la_CFLAGS += \ + $(JACK_CFLAGS) +libsydney_la_LIBADD += \ + $(JACK_LIBS) + +else + +plugin_LTLIBRARIES += \ + libsydney-jack.la + +libsydney_jack_la_SOURCES = \ + jack.c +libsydney_jack_la_CFLAGS = \ + $(JACK_CFLAGS) \ + -Ddriver_open=jack_driver_open \ + -Ddriver_destroy=jack_driver_destroy \ + -Ddriver_change_write_latency=jack_driver_change_write_latency \ + -Ddriver_change_read_latency=jack_driver_change_read_latency \ + -Ddriver_change_device=jack_driver_change_device \ + -Ddriver_change_read_volume=jack_driver_change_read_volume \ + -Ddriver_change_write_volume=jack_driver_change_write_volume \ + -Ddriver_change_pcm_rate=jack_driver_change_pcm_rate \ + -Ddriver_change_props=jack_driver_change_props \ + -Ddriver_get_state=jack_driver_get_state \ + -Ddriver_get_position=jack_driver_get_position \ + -Ddriver_wait=jack_driver_wait \ + -Ddriver_read=jack_driver_read \ + -Ddriver_read_ni=jack_driver_read_ni \ + -Ddriver_pwrite=jack_driver_pwrite \ + -Ddriver_pwrite_ni=jack_driver_pwrite_ni \ + -Ddriver_get_read_size=jack_driver_get_read_size \ + -Ddriver_get_write_size=jack_driver_get_write_size \ + -Ddriver_resume=jack_driver_resume \ + -Ddriver_pause=jack_driver_pause \ + -Ddriver_drain=jack_driver_drain +libsydney_jack_la_LIBADD = \ + $(JACK_LIBS) \ + libsydney.la +libsydney_jack_la_LDFLAGS = \ + -avoid-version -module -export-dynamic + +endif +endif + +if HAVE_NULL +if BUILTIN_NULL + +libsydney_la_SOURCES += \ + null.c + +else + +plugin_LTLIBRARIES += \ + libsydney-null.la + +libsydney_null_la_SOURCES = \ + null.c +libsydney_null_la_CFLAGS = \ + -Ddriver_open=null_driver_open \ + -Ddriver_destroy=null_driver_destroy \ + -Ddriver_change_write_latency=null_driver_change_write_latency \ + -Ddriver_change_read_latency=null_driver_change_read_latency \ + -Ddriver_change_device=null_driver_change_device \ + -Ddriver_change_read_volume=null_driver_change_read_volume \ + -Ddriver_change_write_volume=null_driver_change_write_volume \ + -Ddriver_change_pcm_rate=null_driver_change_pcm_rate \ + -Ddriver_change_props=null_driver_change_props \ + -Ddriver_get_state=null_driver_get_state \ + -Ddriver_get_position=null_driver_get_position \ + -Ddriver_wait=null_driver_wait \ + -Ddriver_read=null_driver_read \ + -Ddriver_read_ni=null_driver_read_ni \ + -Ddriver_pwrite=null_driver_pwrite \ + -Ddriver_pwrite_ni=null_driver_pwrite_ni \ + -Ddriver_get_read_size=null_driver_get_read_size \ + -Ddriver_get_write_size=null_driver_get_write_size \ + -Ddriver_resume=null_driver_resume \ + -Ddriver_pause=null_driver_pause \ + -Ddriver_drain=null_driver_drain +libsydney_null_la_LIBADD = \ + libsydney.la +libsydney_null_la_LDFLAGS = \ + -avoid-version -module -export-dynamic +endif +endif test_bufferq_SOURCES = \ test-bufferq.c @@ -90,12 +344,6 @@ test_pull_LDADD = \ $(AM_LDADD) \ libsydney.la -#test_asyncq_SOURCES = \ -# test-asyncq.c -#test_asyncq_LDADD = \ -# $(AM_LDADD) \ -# libsydney.la - fixme: find -name '*.c' -exec fgrep -H -A 3 -B 3 -i FIXME \{\} \; -- cgit