Mercurial > mplayer.hg

changeset 22524:2e1f6cc38803

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle common parts at the objects instead of at the sources level.
author diego
date Tue, 13 Mar 2007 00:34:56 +0000
parents 5a2e0dfee807
children c82f0b263d10
files Makefile
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Mar 12 23:53:40 2007 +0000
+++ b/Makefile	Tue Mar 13 00:34:56 2007 +0000
@@ -36,7 +36,6 @@
 SRCS_MPLAYER = mplayer.c \
                m_property.c \
                mp_msg.c \
-               $(SRCS_COMMON) \
                mixer.c \
                parser-mpcmd.c \
                subopt-helper.c \
@@ -44,7 +43,6 @@
 
 SRCS_MENCODER = mencoder.c \
                 mp_msg-mencoder.c \
-                $(SRCS_COMMON) \
                 parser-mecmd.c \
                 xvid_vbr.c \
 
@@ -62,14 +60,15 @@
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 libmpdemux/libmpmux.a \
 
+OBJS_COMMON   = $(SRCS_COMMON:.c=.o)
 OBJS_MPLAYER  = $(SRCS_MPLAYER:.c=.o)
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 
 # Having this in libosdep.a is not enough.
 OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
 
-MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(LIBS_MPLAYER)  $(COMMON_LIBS)
-MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
+MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(LIBS_MPLAYER)  $(COMMON_LIBS)
+MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
 
 PARTS = libmpdemux \
         stream \