aboutsummaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorMåns Rullgård2008-10-25 14:00:28 +0000
committerMåns Rullgård2008-10-25 14:00:28 +0000
commitc87348a9223eb0e619fcf6b476fe79ea3ceeb495 (patch)
tree81fd8ee7e64704d9d1caea4d540ed0ad0d59fc70 /libavdevice
parent0ca1656a2bd0e7a21935968a466fbfed511bdc29 (diff)
Use OBJS variable for all object files
There is no longer any need to differentiate the object files by source type. Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 361eda4ff1..655c033b2c 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -20,7 +20,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
# external libraries
OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
-CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
-CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
include $(SUBDIR)../subdir.mak