# HG changeset patch # User diego # Date 1255891491 0 # Node ID 25166964e1ece41b47f0672c1fe90e5ec697d5df # Parent 252ec0ff7e306d0e449eb99a2257599099a33955 Merge rules for building mencoder and mplayer. Just the dependencies are different, so specify them separately. diff -r 252ec0ff7e30 -r 25166964e1ec Makefile --- a/Makefile Sun Oct 18 18:41:35 2009 +0000 +++ b/Makefile Sun Oct 18 18:44:51 2009 +0000 @@ -835,10 +835,11 @@ touch $@ mencoder$(EXESUF): $(MENCODER_DEPS) - $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MENCODER) - +mencoder$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MENCODER) mplayer$(EXESUF): $(MPLAYER_DEPS) - $(CC) -o $@ $^ $(COMMON_LDFLAGS) $(EXTRALIBS_MPLAYER) +mplayer$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MPLAYER) +mencoder$(EXESUF) mplayer$(EXESUF): + $(CC) -o $@ $^ $(COMMON_LDFLAGS) codec-cfg$(EXESUF): codec-cfg.c help_mp.h $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<