summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-13 00:34:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-13 00:34:56 +0000
commit1e4055ebdd2d6d450819b9d626f99e11022e4d03 (patch)
tree308af4c3565f8bd6462994ad281f000c657c6b43 /Makefile
parentf07e14645d0fe3b63be969b2909d8df5844b6bd3 (diff)
downloadmpv-1e4055ebdd2d6d450819b9d626f99e11022e4d03.tar.bz2
mpv-1e4055ebdd2d6d450819b9d626f99e11022e4d03.tar.xz
Handle common parts at the objects instead of at the sources level.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22542 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 7e23fe9d8e..d88485d98d 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,6 @@ SRCS_COMMON-$(UNRARLIB) += unrarlib.c
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_MPLAYER = mplayer.c \
SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
- $(SRCS_COMMON) \
parser-mecmd.c \
xvid_vbr.c \
@@ -62,14 +60,15 @@ LIBS_MPLAYER = libvo/libvo.a \
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 \