Mercurial > mplayer.hg

changeset 29737:25166964e1ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge rules for building mencoder and mplayer. Just the dependencies are different, so specify them separately.
author diego
date Sun, 18 Oct 2009 18:44:51 +0000
parents 252ec0ff7e30
children e66e3a35a045
files Makefile
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 $@ $<