summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-17 21:51:18 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-17 21:51:18 +0000
commit51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e (patch)
treeb6d238b12c49a408962cc6973995ec8a368d90c7 /Makefile
parentc4d86b833e6b595ede4d8b3bd128acf50251dca5 (diff)
downloadmpv-51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e.tar.bz2
mpv-51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e.tar.xz
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5670 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6e5bb0c96e..cba3a19bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,9 @@ MANDIR = ${prefix}/man
# a BSD compatible 'install' program
INSTALL = install
-SRCS_COMMON = xacodec.c cpudetect.c mp_msg.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c
-SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c me-opt-reg.c
-SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c
+SRCS_COMMON = xacodec.c cpudetect.c mp_msg.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c find_sub.c
+SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c me-opt-reg.c
+SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) lirc_mp.c mixer.c mp-opt-reg.c
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
@@ -268,18 +268,19 @@ config.h: configure
# do not rebuild after cvs commits if .developer file is present!
# rebuild at every config.h/config.mak change:
-version.h: config.h config.mak Makefile
+version.h:
./version.sh `$(CC) --version`
ifeq ($(wildcard .developer),)
$(MAKE) distclean
endif
$(MAKE) depend
-# rebuild at every CVS update:
+# rebuild at every CVS update or config/makefile change:
ifeq ($(wildcard .developer),)
ifneq ($(wildcard CVS/Entries),)
version.h: CVS/Entries
endif
+version.h: config.h config.mak Makefile
endif
#