Changeset 111 for fm_server/trunk/src/Makefile.in

Timestamp:

09/03/06 21:19:57 (6 years ago)

Author:

ath

Message:

Restore FmOutputAlsa, delete the old FmOutputOss? and fix some documentation.

Files:

• fm_server/trunk/src/Makefile.in (modified) (5 diffs)

fm_server/trunk/src/Makefile.in

@@ -38 +38 @@
 host_triplet = @host@
 bin_PROGRAMS = fm_server$(EXEEXT)
-@HAVE_JACK_TRUE@am__append_1 = \
+@HAVE_ALSA_TRUE@am__append_1 = \
+@HAVE_ALSA_TRUE@        fm_output_alsa.c \
+@HAVE_ALSA_TRUE@        fm_output_alsa.h
+
+@HAVE_ALSA_TRUE@am__append_2 = -lasound
+@HAVE_JACK_TRUE@am__append_3 = \
 @HAVE_JACK_TRUE@        fm_output_jack.c \
 @HAVE_JACK_TRUE@        fm_output_jack.h
@@ -62 +67 @@
         fm_effect_gain.h fm_effect_rate.c fm_effect_rate.h fm_mixer.c \
         fm_mixer.h fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h fm_output_jack.c \
-        fm_output_jack.h
-@HAVE_JACK_TRUE@am__objects_1 = fm_output_jack.$(OBJEXT)
+        fm_effect_pan.c fm_effect_pan.h fm_output_alsa.c \
+        fm_output_alsa.h fm_output_jack.c fm_output_jack.h
+@HAVE_ALSA_TRUE@am__objects_1 = fm_output_alsa.$(OBJEXT)
+@HAVE_JACK_TRUE@am__objects_2 = fm_output_jack.$(OBJEXT)
 am_fm_server_OBJECTS = main.$(OBJEXT) fm_utils.$(OBJEXT) \
         fm_input.$(OBJEXT) fm_output.$(OBJEXT) fm_effect.$(OBJEXT) \
@@ -72 +78 @@
         fm_effect_rate.$(OBJEXT) fm_mixer.$(OBJEXT) \
         fm_djmixer.$(OBJEXT) fm_buffer.$(OBJEXT) \
-        fm_effect_pan.$(OBJEXT) $(am__objects_1)
+        fm_effect_pan.$(OBJEXT) $(am__objects_1) $(am__objects_2)
 fm_server_OBJECTS = $(am_fm_server_OBJECTS)
 am__DEPENDENCIES_1 =
 fm_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-        fm_input_gst/libfm_input_gst.la
+        fm_input_gst/libfm_input_gst.la $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -258 +264 @@
         fm_effect_rate.c fm_effect_rate.h fm_mixer.c fm_mixer.h \
         fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h $(am__append_1)
-fm_server_LDADD = \
-        $(FM_SERVER_LIBS) \
-        fm_input_gst/libfm_input_gst.la
-
+        fm_effect_pan.c fm_effect_pan.h $(am__append_1) \
+        $(am__append_3)
+fm_server_LDADD = $(FM_SERVER_LIBS) fm_input_gst/libfm_input_gst.la \
+        $(am__append_2)
 all: all-recursive
 
@@ -347 +352 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_mixer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_alsa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_jack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_pipeline.Po@am__quote@