matroskadec: minor simplification

[ffmpeg] / libavdevice / Makefile

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index aef30c02101ed09bd7e66b403eb65acc9dcbc1a8..1c0630b38c10fec63b3eb883889e2b50d6533c7b 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,26 +1,30 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
 
-NAME=avdevice
-
-FFLIBS = avformat avcodec avutil
-
-OBJS = alldevices.o
+NAME    = avdevice
+FFLIBS  = avformat avcodec avcore avutil
 
 HEADERS = avdevice.h
 
+OBJS    = alldevices.o avdevice.o
+
 # input/output devices
-OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
-OBJS-$(CONFIG_OSS_DEMUXER)               += audio.o
-OBJS-$(CONFIG_OSS_MUXER)                 += audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.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
 
-CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)     += beosaudio.o
-CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER)       += beosaudio.o
+SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
 
-include ../common.mak
+include $(SUBDIR)../subdir.mak