Commit b1b18481 authored by Diego Biurrun's avatar Diego Biurrun

Merge binary generation rules.

Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 14f3ce36
...@@ -81,7 +81,7 @@ endif ...@@ -81,7 +81,7 @@ endif
MAKE-yes = $(MAKE) MAKE-yes = $(MAKE)
MAKE- = : $(MAKE) MAKE- = : $(MAKE)
all: lib $(PROGS) $(ALL_TARGETS-yes) all: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
lib: lib:
$(MAKE) -C libavutil all $(MAKE) -C libavutil all
...@@ -92,14 +92,11 @@ lib: ...@@ -92,14 +92,11 @@ lib:
$(MAKE-$(CONFIG_SWSCALE)) -C libswscale all $(MAKE-$(CONFIG_SWSCALE)) -C libswscale all
$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS)
$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
ffserver_g$(EXESUF): ffserver.o cmdutils.o .libs
$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs %_g$(EXESUF): %.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) $(SDL_LIBS) $(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
%$(EXESUF): %_g$(EXESUF) %$(EXESUF): %_g$(EXESUF)
cp -p $< $@ cp -p $< $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment