X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=d2aed23cd45412a08da2fb99c0d871e4ce034da0;hb=36a8c43073114cffc6ea147178f227a95e40a59f;hp=682eda75a4d939bff3c143089ef9616cb5aa7ac5;hpb=dfd9159f3db987e9115715cded7a4408179e3ed9;p=ffmpeg diff --git a/Makefile b/Makefile index 682eda75a4d..d2aed23cd45 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ vpath %.texi $(SRC_PATH) ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC -SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB +BRIEF = CC HOSTCC AS YASM AR LD +SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ @@ -60,6 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = cmdutils.o +OBJS-avconv = avconv_opt.o avconv_filter.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher @@ -102,9 +103,10 @@ config.h: .config SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ - ALTIVEC-OBJS ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS MMI-OBJS \ - MMX-OBJS NEON-OBJS VIS-OBJS YASM-OBJS \ - OBJS TESTOBJS + ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ + MMI-OBJS ALTIVEC-OBJS VIS-OBJS \ + MMX-OBJS YASM-OBJS \ + OBJS HOSTOBJS TESTOBJS define RESET $(1) :=