Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
3e105d08
Commit
3e105d08
authored
Dec 05, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Move entries related to building TOOLS to a subdirectory Makefile
parent
4104cc56
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
Makefile
Makefile
+1
-7
Makefile
tools/Makefile
+11
-0
No files found.
Makefile
View file @
3e105d08
...
...
@@ -90,8 +90,6 @@ OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
TESTTOOLS
=
audiogen videogen rotozoom tiny_psnr
base64
HOSTPROGS
:=
$
(
TESTTOOLS:%
=
tests/%
)
doc/print_options
TOOLS
=
qt-faststart trasher
TOOLS-$(CONFIG_ZLIB)
+=
cws2fws
# $(FFLIBS-yes) needs to be in linking order
FFLIBS-$(CONFIG_AVDEVICE)
+=
avdevice
...
...
@@ -108,6 +106,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
SKIPHEADERS
=
cmdutils_common_opts.h
\
compat/w32pthreads.h
include
$(SRC_PATH)/tools/Makefile
include
$(SRC_PATH)/common.mak
FF_EXTRALIBS
:=
$(FFEXTRALIBS)
...
...
@@ -171,10 +170,6 @@ $(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
$(PROGS)
:
%$(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
...
...
@@ -219,7 +214,6 @@ uninstall-data:
clean
::
$(RM)
$(ALLAVPROGS)
$(RM)
$(CLEANSUFFIXES)
$(RM)
$
(
CLEANSUFFIXES:%
=
tools/%
)
$(RM)
-rf
coverage.info lcov
distclean
::
...
...
tools/Makefile
0 → 100644
View file @
3e105d08
TOOLS
=
qt-faststart trasher
TOOLS-$(CONFIG_ZLIB)
+=
cws2fws
tools/cws2fws$(EXESUF)
:
ELIBS = $(ZLIB)
OBJDIRS
+=
tools
clean
::
$(RM)
$
(
CLEANSUFFIXES:%
=
tools/%
)
-include
$(wildcard
tools/*.d)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment