Mercurial > mplayer.hg
diff Makefile @ 22844:ebfd79a43300
Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes
to OBJS_*. The content of OBJS_*-yes was getting clobbered.
author | diego |
---|---|
date | Sat, 31 Mar 2007 18:12:16 +0000 |
parents | 2e506e1c8d85 |
children | bddb09395c3e |
line wrap: on
line diff
--- a/Makefile Sat Mar 31 14:22:44 2007 +0000 +++ b/Makefile Sat Mar 31 18:12:16 2007 +0000 @@ -91,6 +91,10 @@ 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 @@ 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)