summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-04-07 21:16:31 +0000
committerMåns Rullgård <mans@mansr.com>2008-04-07 21:16:31 +0000
commit71c61f62a3ca855062c832ec2ed27e331221af45 (patch)
tree8345f97e1bc07033d6d183fe33c65c3f6e1b0814 /libavdevice
parentc09ed33e186ea0ba4ab96599bd69aea462aabeda (diff)
non-recursive makefiles
Originally committed as revision 12760 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 ddb0113c79..5bdf38ff2d 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,4 +1,4 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
NAME = avdevice
FFLIBS = avformat avcodec avutil
@@ -23,4 +23,4 @@ OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
-include ../common.mak
+include $(SUBDIR)../subdir.mak