[MPlayer-cvslog] r29779 - trunk/Makefile

[diego]

Author: diego
Date: Sun Oct 18 20:44:51 2009
New Revision: 29779

Log:
Merge rules for building mencoder and mplayer.
Just the dependencies are different, so specify them separately.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Oct 18 20:41:35 2009	(r29778)
+++ trunk/Makefile	Sun Oct 18 20:44:51 2009	(r29779)
@@ -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 $@ $<