mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge binary generation rules.
Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
14f3ce3615
commit
b1b184812c
13
Makefile
13
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,15 +92,12 @@ lib:
|
||||
$(MAKE-$(CONFIG_SWSCALE)) -C libswscale all
|
||||
$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
|
||||
|
||||
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
|
||||
ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS)
|
||||
ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
|
||||
|
||||
%_g$(EXESUF): %.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): ffplay.o cmdutils.o .libs
|
||||
$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
|
||||
|
||||
%$(EXESUF): %_g$(EXESUF)
|
||||
cp -p $< $@
|
||||
$(STRIP) $@
|
||||
|
Loading…
Reference in New Issue
Block a user