From 1e4055ebdd2d6d450819b9d626f99e11022e4d03 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 13 Mar 2007 00:34:56 +0000 Subject: 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 --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile') 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 \ -- cgit v1.2.3