diff options
author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-10-18 13:13:30 +0000 |
---|---|---|
committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-10-18 13:13:30 +0000 |
commit | 544297ca6a13e6797a4ee895fc63efceb5602d30 (patch) | |
tree | 0c288e7cc6884fe94a4b33dde89e7a1fd65d402c /src/audio_out/Makefile.am | |
parent | 1960afd6d989f4bfa9eba33513baf16de8e49fca (diff) | |
download | xine-lib-544297ca6a13e6797a4ee895fc63efceb5602d30.tar.gz xine-lib-544297ca6a13e6797a4ee895fc63efceb5602d30.tar.bz2 |
Move alsa audio over to new api.
CVS patchset: 2848
CVS date: 2002/10/18 13:13:30
Diffstat (limited to 'src/audio_out/Makefile.am')
-rw-r--r-- | src/audio_out/Makefile.am | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index 692ce728b..7b6394aff 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -1,7 +1,6 @@ AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) -EXTRA_DIST = audio_alsa_out.c \ - audio_arts_out.c \ +EXTRA_DIST = audio_arts_out.c \ audio_esd_out.c \ audio_irixal_out.c \ audio_sun_out.c @@ -14,11 +13,11 @@ if HAVE_OSS oss_module = xineplug_ao_out_oss.la endif -#if HAVE_ALSA -#if HAVE_ALSA09 -#alsa_module = xineplug_ao_out_alsa.la -#endif -#endif +if HAVE_ALSA +if HAVE_ALSA09 +alsa_module = xineplug_ao_out_alsa.la +endif +endif #if HAVE_ESD #esd_module = xineplug_ao_out_esd.la @@ -42,7 +41,8 @@ endif # all xine audio out plugins should be named like the # scheme "xineplug_ao_out_" # -lib_LTLIBRARIES = $(oss_module) +lib_LTLIBRARIES = $(oss_module) \ + $(alsa_module) #lib_LTLIBRARIES = \ # $(alsa_module) \ @@ -55,9 +55,9 @@ lib_LTLIBRARIES = $(oss_module) xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module -#xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c -#xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) -#xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module +xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c +xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) +xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module #xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c #xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) |