diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 17:09:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 17:17:20 -0300 |
| commit | 5dba808064e7879c04d3e2fb4f10e709bedf51c2 (patch) | |
| tree | 114a5bcc16c6382af987691e02bf33aa6f05d084 | |
| parent | 7f933718dc557ebff19cad94842283db5ff2b74b (diff) | |
| parent | 3e105d08848162b90d886bde59c010d4b0362a4b (diff) | |
| download | ffmpeg-5dba808064e7879c04d3e2fb4f10e709bedf51c2.tar.gz | |
Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'
* commit '3e105d08848162b90d886bde59c010d4b0362a4b':
build: Move entries related to building TOOLS to a subdirectory Makefile
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | tools/Makefile | 13 |
2 files changed, 14 insertions, 11 deletions
@@ -43,8 +43,6 @@ OBJS-ffserver += ffserver_config.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options -TOOLS = qt-faststart trasher uncoded_frame -TOOLS-$(CONFIG_ZLIB) += cws2fws # $(FFLIBS-yes) needs to be in linking order FFLIBS-$(CONFIG_AVDEVICE) += avdevice @@ -64,6 +62,7 @@ EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examp SKIPHEADERS = cmdutils_common_opts.h \ compat/w32pthreads.h +include $(SRC_PATH)/tools/Makefile include $(SRC_PATH)/common.mak FF_EXTRALIBS := $(FFEXTRALIBS) @@ -75,10 +74,6 @@ all: $(AVPROGS) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) -tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) -tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) -tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) - CONFIGURABLE_COMPONENTS = \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/version.h)) \ @@ -136,10 +131,6 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) -OBJDIRS += tools - --include $(wildcard tools/*.d) - VERSION_SH = $(SRC_PATH)/version.sh GIT_LOG = $(SRC_PATH)/.git/logs/HEAD @@ -184,7 +175,6 @@ uninstall-data: clean:: $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(RM) $(CLEANSUFFIXES) - $(RM) $(CLEANSUFFIXES:%=tools/%) $(RM) $(CLEANSUFFIXES:%=compat/msvcrt/%) $(RM) $(CLEANSUFFIXES:%=compat/atomics/pthread/%) $(RM) $(CLEANSUFFIXES:%=compat/%) diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 0000000000..f8e1434f29 --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,13 @@ +TOOLS = qt-faststart trasher uncoded_frame +TOOLS-$(CONFIG_ZLIB) += cws2fws + +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) +tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) +tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) + +OBJDIRS += tools + +clean:: + $(RM) $(CLEANSUFFIXES:%=tools/%) + +-include $(wildcard tools/*.d) |