summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-18 18:44:51 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-18 18:44:51 +0000
commitda278b3184f5abf4bea6f547c691586b239b4c41 (patch)
tree9b54bcfcbeba0be8306fa8b25a30f4dc0c0dc1d1 /Makefile
parent47f0629f1a3898f11f4789eafa6bb11bee162cfc (diff)
downloadmpv-da278b3184f5abf4bea6f547c691586b239b4c41.tar.bz2
mpv-da278b3184f5abf4bea6f547c691586b239b4c41.tar.xz
Merge rules for building mencoder and mplayer.
Just the dependencies are different, so specify them separately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a7fad88629..a8e7e7f0ba 100644
--- a/Makefile
+++ b/Makefile
@@ -835,10 +835,11 @@ $(FFMPEGLIBS): $(FFMPEGFILES) config.h
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 $@ $<