cosmetics: XviD is now called Xvid.

[ffmpeg] / libavdevice / Makefile

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index aef30c02101ed09bd7e66b403eb65acc9dcbc1a8..361eda4ff18185e959358aef2aee065c0e728c72 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,13 +1,12 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
 
-NAME=avdevice
-
-FFLIBS = avformat avcodec avutil
-
-OBJS = alldevices.o
+NAME    = avdevice
+FFLIBS  = avformat avcodec avutil
 
 HEADERS = avdevice.h
 
+OBJS    = alldevices.o
+
 # input/output devices
 OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
 OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
@@ -15,12 +14,13 @@ 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_VFWCAP_DEMUXER)            += vfwcap.o
 OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
 
 # external libraries
 OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
 
-CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)     += beosaudio.o
-CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER)       += beosaudio.o
+CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)    += beosaudio.o
+CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER)      += beosaudio.o
 
-include ../common.mak
+include $(SUBDIR)../subdir.mak