small automake.am clean - should still be easy to re-enable currently disabled audio output plugins as soon as they're ported

CVS patchset: 463
CVS date: 2001/08/22 15:45:47

1 files changed, 27 insertions, 25 deletions

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index a57a65c2f..787534535 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,9 +1,8 @@
 CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
 
-#EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c \
-#	audio_sun_out.c audio_arts_out.c 
-## audio_irixal_out.c
-EXTRA_DIST = audio_alsa_out.c
+EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c \
+	     audio_sun_out.c audio_arts_out.c 
+# audio_irixal_out.c
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -18,29 +17,29 @@ endif
 # on the alsa project side
 #
 if HAVE_ALSA
-if HAVE_ALSA05
+#if HAVE_ALSA05
 #alsa05_module = xineplug_ao_out_alsa05.la
-endif
+#endif
 if HAVE_ALSA09
 alsa_module = xineplug_ao_out_alsa.la
 endif
 endif
 
-if HAVE_ESD
+#if HAVE_ESD
 #esd_module = xineplug_ao_out_esd.la
-endif
+#endif
 
-if HAVE_SUNAUDIO
+#if HAVE_SUNAUDIO
 #sun_module = xineplug_ao_out_sun.la
-endif
+#endif
 
 ## if HAVE_IRIXAL
 ## irixal_module = xineplug_ao_out_irixal.la
 ## endif
 
-if HAVE_ARTS
+#if HAVE_ARTS
 #arts_module = xineplug_ao_out_arts.la
-endif
+#endif
 
 ##
 # IMPORTANT:
@@ -48,35 +47,38 @@ endif
 # All of xine audio out plugins should be named like the 
 # scheme "xineplug_ao_out_"
 #
-lib_LTLIBRARIES = $(oss_module) $(alsa05_module) $(alsa_module) $(sun_module) \
-		  $(arts_module) $(esd_module)
+#lib_LTLIBRARIES = $(oss_module) $(alsa05_module) $(alsa_module) $(sun_module) \
+#		  $(arts_module) $(esd_module)
+
+lib_LTLIBRARIES = $(oss_module) $(alsa_module)
+
 ## $(irixal_module) 
 
 xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c resample.c
 xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c resample.c
-xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS)	
-xineplug_ao_out_alsa05_la_LDFLAGS = -avoid-version -module
+#xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c resample.c
+#xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS)	
+#xineplug_ao_out_alsa05_la_LDFLAGS = -avoid-version -module
 
 xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c resample.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 resample.c
-xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
-xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
+#xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c resample.c
+#xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
+#xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c resample.c
-xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
+#xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c resample.c
+#xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
 
 ## xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c resample.c
 ## xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
 ## xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c resample.c
-xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
-xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
+#xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c resample.c
+#xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
+#xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = audio_oss_out.h audio_alsa_out.h audio_esd_out.h \
 	audio_sun_out.h audio_arts_out.h resample.h