From 7bbb6e7043093504ca77df3fe4eb3204ca9c867c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 31 Mar 2007 18:12:16 +0000 Subject: Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes to OBJS_*. The content of OBJS_*-yes was getting clobbered. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22862 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f16780be3f..7cb219db25 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,10 @@ OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) +OBJS_COMMON = $(SRCS_COMMON:.c=.o) +OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) +OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) + SRCS_COMMON += $(SRCS_COMMON-yes) COMMON_LIBS += $(COMMON_LIBS-yes) LIBS_MPLAYER += $(LIBS_MPLAYER-yes) @@ -98,10 +102,6 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes) PARTS += $(PARTS-yes) ALL_PRG += $(ALL_PRG-yes) -OBJS_COMMON = $(SRCS_COMMON:.c=.o) -OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) - COMMON_LIBS += osdep/libosdep.a MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -- cgit v1.2.3