Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
3e105d08
Commit
3e105d08
authored
8 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
build: Move entries related to building TOOLS to a subdirectory Makefile
parent
4104cc56
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-7
1 addition, 7 deletions
Makefile
tools/Makefile
+11
-0
11 additions, 0 deletions
tools/Makefile
with
12 additions
and
7 deletions
Makefile
+
1
−
7
View file @
3e105d08
...
@@ -90,8 +90,6 @@ OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
...
@@ -90,8 +90,6 @@ OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
TESTTOOLS
=
audiogen videogen rotozoom tiny_psnr
base64
TESTTOOLS
=
audiogen videogen rotozoom tiny_psnr
base64
HOSTPROGS
:=
$(
TESTTOOLS:%
=
tests/%
)
doc/print_options
HOSTPROGS
:=
$(
TESTTOOLS:%
=
tests/%
)
doc/print_options
TOOLS
=
qt-faststart trasher
TOOLS-$(CONFIG_ZLIB)
+=
cws2fws
# $(FFLIBS-yes) needs to be in linking order
# $(FFLIBS-yes) needs to be in linking order
FFLIBS-$(CONFIG_AVDEVICE)
+=
avdevice
FFLIBS-$(CONFIG_AVDEVICE)
+=
avdevice
...
@@ -108,6 +106,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
...
@@ -108,6 +106,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
SKIPHEADERS
=
cmdutils_common_opts.h
\
SKIPHEADERS
=
cmdutils_common_opts.h
\
compat/w32pthreads.h
compat/w32pthreads.h
include
$(SRC_PATH)/tools/Makefile
include
$(SRC_PATH)/common.mak
include
$(SRC_PATH)/common.mak
FF_EXTRALIBS
:=
$(
FFEXTRALIBS
)
FF_EXTRALIBS
:=
$(
FFEXTRALIBS
)
...
@@ -171,10 +170,6 @@ $(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
...
@@ -171,10 +170,6 @@ $(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
$(PROGS)
:
%$(EXESUF): %.o $(FF_DEP_LIBS)
$(PROGS)
:
%$(EXESUF): %.o $(FF_DEP_LIBS)
$(
LD
)
$(
LDFLAGS
)
$(
LDEXEFLAGS
)
$(
LD_O
)
$(
OBJS-
$*
)
$(
FF_EXTRALIBS
)
$(
LD
)
$(
LDFLAGS
)
$(
LDEXEFLAGS
)
$(
LD_O
)
$(
OBJS-
$*
)
$(
FF_EXTRALIBS
)
OBJDIRS
+=
tools
-include
$(wildcard tools/*.d)
VERSION_SH
=
$(
SRC_PATH
)
/version.sh
VERSION_SH
=
$(
SRC_PATH
)
/version.sh
GIT_LOG
=
$(
SRC_PATH
)
/.git/logs/HEAD
GIT_LOG
=
$(
SRC_PATH
)
/.git/logs/HEAD
...
@@ -219,7 +214,6 @@ uninstall-data:
...
@@ -219,7 +214,6 @@ uninstall-data:
clean
::
clean
::
$(
RM
)
$(
ALLAVPROGS
)
$(
RM
)
$(
ALLAVPROGS
)
$(
RM
)
$(
CLEANSUFFIXES
)
$(
RM
)
$(
CLEANSUFFIXES
)
$(
RM
)
$(
CLEANSUFFIXES:%
=
tools/%
)
$(
RM
)
-rf
coverage.info lcov
$(
RM
)
-rf
coverage.info lcov
distclean
::
distclean
::
...
...
This diff is collapsed.
Click to expand it.
tools/Makefile
0 → 100644
+
11
−
0
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)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment