revert r20775, because equivalent code has been committed to x264 instead

[ffmpeg] / libavdevice / Makefile

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index b769d16c767eeda63c85c6f3d2b1193b96930baf..a0c3858d83261d478b19db0ae22bd60038731c6c 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -5,25 +5,29 @@ FFLIBS  = avformat avcodec avutil
 
 HEADERS = avdevice.h
 
-OBJS    = alldevices.o
+OBJS    = alldevices.o avdevice.o
 
 # input/output devices
-OBJS-$(CONFIG_ALSA_DEMUXER)              += alsa-audio-common.o alsa-audio-dec.o
-OBJS-$(CONFIG_ALSA_MUXER)                += alsa-audio-common.o alsa-audio-enc.o
-OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
-OBJS-$(CONFIG_JACK_DEMUXER)              += jack_audio.o
-OBJS-$(CONFIG_OSS_DEMUXER)               += oss_audio.o
-OBJS-$(CONFIG_OSS_MUXER)                 += oss_audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.o
-OBJS-$(CONFIG_VFWCAP_DEMUXER)            += vfwcap.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
+OBJS-$(CONFIG_ALSA_INDEV)                += alsa-audio-common.o \
+                                            alsa-audio-dec.o
+OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa-audio-common.o \
+                                            alsa-audio-enc.o
+OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
+OBJS-$(CONFIG_DV1394_INDEV)              += dv1394.o
+OBJS-$(CONFIG_JACK_INDEV)                += jack_audio.o
+OBJS-$(CONFIG_OSS_INDEV)                 += oss_audio.o
+OBJS-$(CONFIG_OSS_OUTDEV)                += oss_audio.o
+OBJS-$(CONFIG_V4L2_INDEV)                += v4l2.o
+OBJS-$(CONFIG_V4L_INDEV)                 += v4l.o
+OBJS-$(CONFIG_VFWCAP_INDEV)              += vfwcap.o
+OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV)     += x11grab.o
 
 # external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
+OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
 
-OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)        += beosaudio.o
-OBJS-$(CONFIG_AUDIO_BEOS_MUXER)          += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_INDEV)          += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_OUTDEV)         += beosaudio.o
+
+SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
 
 include $(SUBDIR)../subdir.mak