summaryrefslogtreecommitdiff
path: root/libavformat/Makefile
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 /libavformat/Makefile
parentc09ed33e186ea0ba4ab96599bd69aea462aabeda (diff)
non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 5ac7ea1c57..6dd2c4e1e9 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -2,7 +2,7 @@
# libavformat Makefile
# (c) 2000-2003 Fabrice Bellard
#
-include ../config.mak
+include $(SUBDIR)../config.mak
NAME = avformat
FFLIBS = avcodec avutil
@@ -198,4 +198,4 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
-include ../common.mak
+include $(SUBDIR)../subdir.mak