summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 11:49:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 11:49:47 +0000
commit6178e38e46480f00e89521036b8011260de01699 (patch)
treed5650dbcb4debdd89e968256559aac0b64c8586a /libvo
parent3f6df7b9984662a3c603f007fc9d6f9c781c939a (diff)
downloadmpv-6178e38e46480f00e89521036b8011260de01699.tar.bz2
mpv-6178e38e46480f00e89521036b8011260de01699.tar.xz
Split libvo.a into two libs so that libosd.a can be used by MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/Makefile23
1 files changed, 15 insertions, 8 deletions
diff --git a/libvo/Makefile b/libvo/Makefile
index aace054d93..c45aaf5da0 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -2,19 +2,21 @@
include ../config.mak
LIBNAME = libvo.a
+LIBNAME2 = libosd.a
-SRCS=aclib.c \
- aspect.c \
+SRCS=aspect.c \
geometry.c \
- osd.c \
spuenc.c \
- sub.c \
video_out.c \
vo_mpegpes.c \
vo_null.c \
vo_yuv4mpeg.c \
$(VO_SRCS) \
+SRCS2 = aclib.c \
+ osd.c \
+ sub.c \
+
ifeq ($(CONFIG_LIBAVUTIL),yes)
LIBAV_INC += -I../libavutil
endif
@@ -22,12 +24,13 @@ endif
OBJS_TEMP=$(basename $(SRCS))
OBJS=$(OBJS_TEMP:%=%.o)
+OBJS2=$(SRCS2:.c=.o)
+
ifeq ($(BITMAP_FONT),yes)
-SRCS += font_load.c
+SRCS2 += font_load.c
endif
-
ifeq ($(FREETYPE),yes)
-SRCS += font_load_ft.c
+SRCS2 += font_load_ft.c
endif
ifeq ($(VIDIX),yes)
@@ -53,11 +56,15 @@ CFLAGS = $(INCLUDE) $(OPTFLAGS)
.m.o:
$(CC) -c $(CFLAGS) -o $@ $<
+all: $(LIBNAME) $(LIBNAME2)
+
$(LIBNAME): $(OBJS)
$(AR) r $(LIBNAME) $(OBJS)
$(RANLIB) $(LIBNAME)
-all: $(LIBNAME)
+$(LIBNAME2): $(OBJS2)
+ $(AR) r $(LIBNAME2) $(OBJS2)
+ $(RANLIB) $(LIBNAME2)
clean:
rm -f *.o *.a *~