diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-15 19:57:09 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-15 19:57:09 +0000 |
| commit | b1b184812c12151067743f94c374ec813c9bc4a3 (patch) | |
| tree | f543905187fc800c0bf73c53841d7807f945c8b9 /Makefile | |
| parent | 14f3ce3615fea787787299de336f27070794b6d0 (diff) | |
| download | ffmpeg-b1b184812c12151067743f94c374ec813c9bc4a3.tar.gz | |
Merge binary generation rules.
Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -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 $< $@ |