summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 17:28:14 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 17:28:14 +0000
commit02a3a41923485c181b6ef79ba7363d461dbde11f (patch)
tree5aab0925a7c754cf054fbac574bd92fd549e31dd /libvo
parent7118457b204afb6036dde8b3140b8f00286c8c1f (diff)
downloadmpv-02a3a41923485c181b6ef79ba7363d461dbde11f.tar.bz2
mpv-02a3a41923485c181b6ef79ba7363d461dbde11f.tar.xz
Use only one global config.mak file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19039 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/Makefile b/libvo/Makefile
index 6851f83fab..72df517f5d 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -1,5 +1,5 @@
-include config.mak
+include ../config.mak
LIBNAME = libvo.a
@@ -14,7 +14,7 @@ SRCS=aclib.c \
vo_mpegpes.c \
vo_null.c \
vo_yuv4mpeg.c \
- $(OPTIONAL_SRCS) \
+ $(VO_SRCS) \
LIBAV_INC =
ifeq ($(CONFIG_LIBAVUTIL),yes)