[MPlayer-cvslog] r22862 - trunk/Makefile

[diego]

Author: diego
Date: Sat Mar 31 20:12:16 2007
New Revision: 22862

Modified:
   trunk/Makefile

Log:
Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes
to OBJS_*.  The content of OBJS_*-yes was getting clobbered.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Mar 31 20:12:16 2007
@@ -91,6 +91,10 @@ OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mp
 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)