X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=3bb4112c1a3756dba3c5c527baf9fd9ff4c902a5;hb=a736eb4a605f46d5ff96c7b32e55710ecd9cce89;hp=f2341955c73a72c63cadf9e298fe74fe2322769d;hpb=574dcb5baf26c7cce755b51e445ca7109f0f1260;p=ffmpeg diff --git a/Makefile b/Makefile index f2341955c73..3bb4112c1a3 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ PROGS := $(PROGS-yes:%=%$(EXESUF)) INSTPROGS = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF)) OBJS = $(PROGS-yes:%=%.o) cmdutils.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 -HOSTPROGS := $(TESTTOOLS:%=tests/%) +HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws @@ -64,9 +64,10 @@ config.h: .config @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ - ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ - HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS +SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ + ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ + ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ + OBJS TESTOBJS define RESET $(1) :=