@ -58,6 +58,8 @@ PROGS := $(PROGS-yes:%=%$(EXESUF))
OBJS = $( PROGS-yes:%= %.o) cmdutils.o
OBJS = $( PROGS-yes:%= %.o) cmdutils.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $( TESTTOOLS:%= tests/%)
HOSTPROGS := $( TESTTOOLS:%= tests/%)
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
BASENAMES = ffmpeg ffplay ffprobe ffserver
BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $( BASENAMES:%= %$( EXESUF) )
ALLPROGS = $( BASENAMES:%= %$( EXESUF) )
@ -86,6 +88,11 @@ FF_DEP_LIBS := $(DEP_LIBS)
all : $( FF_DEP_LIBS ) $( PROGS )
all : $( FF_DEP_LIBS ) $( PROGS )
$(TOOLS) : %$( EXESUF ) : %.o
$( LD) $( LDFLAGS) -o $@ $< $( ELIBS)
tools/cws2fws$(EXESUF) : ELIBS = -lz
config.h : .config
config.h : .config
.config : $( wildcard $ ( FFLIBS :%=$ ( SRC_PATH ) /lib %/all *.c ) )
.config : $( wildcard $ ( FFLIBS :%=$ ( SRC_PATH ) /lib %/all *.c ) )
@-tput bold 2>/dev/null
@-tput bold 2>/dev/null
@ -94,7 +101,7 @@ config.h: .config
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS
HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS
d e f i n e R E S E T
d e f i n e R E S E T
$(1) :=
$(1) :=
@ -116,18 +123,6 @@ ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
$(PROGS) : %$( EXESUF ) : %.o cmdutils .o $( FF_DEP_LIBS )
$(PROGS) : %$( EXESUF ) : %.o cmdutils .o $( FF_DEP_LIBS )
$( LD) $( FF_LDFLAGS) -o $@ $< cmdutils.o $( FF_EXTRALIBS)
$( LD) $( FF_LDFLAGS) -o $@ $< cmdutils.o $( FF_EXTRALIBS)
TOOLS = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher
TOOLOBJS := $( TOOLS:%= tools/%.o)
TOOLS := $( TOOLS:%= tools/%$( EXESUF) )
alltools : $( TOOLS )
tools/%$(EXESUF) : tools /%.o
$( LD) $( FF_LDFLAGS) -o $@ $< $( FF_EXTRALIBS)
$(TOOLOBJS) : %.o : %.c | tools
$( CC) $( CPPFLAGS) $( CFLAGS) -c $( CC_O) $<
OBJDIRS += tools
OBJDIRS += tools
- i n c l u d e $( wildcard tools /*.d )
- i n c l u d e $( wildcard tools /*.d )