[SCM] libav/experimental: Merge binary generation rules.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b1b184812c12151067743f94c374ec813c9bc4a3
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Mar 15 19:57:09 2008 +0000

    Merge binary generation rules.
    
    Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index bb5aa51..f2b6142 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ endif
 MAKE-yes = $(MAKE)
 MAKE-    = : $(MAKE)
 
-all: lib $(PROGS) $(ALL_TARGETS-yes)
+all: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
 
 lib:
 	$(MAKE)                    -C libavutil   all
@@ -92,14 +92,11 @@ lib:
 	$(MAKE-$(CONFIG_SWSCALE))  -C libswscale  all
 	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
 
-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
-
-ffserver_g$(EXESUF): ffserver.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
+ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS)
+ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
 
-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
+%_g$(EXESUF): %.o cmdutils.o .libs
+	$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
 
 %$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@

-- 
Libav/FFmpeg packaging