Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7e5bde93
Commit
7e5bde93
authored
Feb 03, 2019
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Rename OBJDIRS variable to OUTDIRS
These directories are not just for object files.
parent
90b15f60
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
Makefile
Makefile
+1
-1
common.mak
avbuild/common.mak
+1
-1
Makefile
avtools/Makefile
+1
-1
Makefile
doc/examples/Makefile
+1
-1
Makefile
tests/Makefile
+1
-1
Makefile
tests/checkasm/Makefile
+1
-1
Makefile
tools/Makefile
+1
-1
No files found.
Makefile
View file @
7e5bde93
...
@@ -184,7 +184,7 @@ check: all alltools checkheaders examples testprogs fate
...
@@ -184,7 +184,7 @@ check: all alltools checkheaders examples testprogs fate
include
$(SRC_PATH)/tests/Makefile
include
$(SRC_PATH)/tests/Makefile
$(sort $(O
BJ
DIRS))
:
$(sort $(O
UT
DIRS))
:
$(Q)
mkdir
-p
$@
$(Q)
mkdir
-p
$@
# Dummy rule to stop make trying to rebuild removed or renamed headers
# Dummy rule to stop make trying to rebuild removed or renamed headers
...
...
avbuild/common.mak
View file @
7e5bde93
...
@@ -47,7 +47,7 @@ $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
...
@@ -47,7 +47,7 @@ $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
$(TOOLOBJS): | tools
$(TOOLOBJS): | tools
O
BJDIRS := $(OBJ
DIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
O
UTDIRS := $(OUT
DIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.map *.o *.pc *.ver *.version *~
CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.map *.o *.pc *.ver *.version *~
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
...
...
avtools/Makefile
View file @
7e5bde93
...
@@ -28,7 +28,7 @@ $(foreach P,$(AVPROGS-yes),$(eval $(call DOAVTOOL,$(P))))
...
@@ -28,7 +28,7 @@ $(foreach P,$(AVPROGS-yes),$(eval $(call DOAVTOOL,$(P))))
all
:
$(AVPROGS)
all
:
$(AVPROGS)
avtools/cmdutils.o
:
avversion.h | avtools
avtools/cmdutils.o
:
avversion.h | avtools
O
BJ
DIRS
+=
avtools
O
UT
DIRS
+=
avtools
ifdef
AVPROGS
ifdef
AVPROGS
install
:
install-progs install-data
install
:
install-progs install-data
...
...
doc/examples/Makefile
View file @
7e5bde93
...
@@ -18,7 +18,7 @@ $(EXAMPLES): %$(EXESUF): %.o
...
@@ -18,7 +18,7 @@ $(EXAMPLES): %$(EXESUF): %.o
examples
:
$(EXAMPLES)
examples
:
$(EXAMPLES)
$(EXAMPLES
:
%$(EXESUF)=%.o): | doc/examples
$(EXAMPLES
:
%$(EXESUF)=%.o): | doc/examples
O
BJ
DIRS
+=
doc/examples
O
UT
DIRS
+=
doc/examples
DOXY_INPUT
+=
$
(
addprefix
$(SRC_PATH)
/,
$
(
EXAMPLES:%
$(EXESUF)
=
%.c
))
DOXY_INPUT
+=
$
(
addprefix
$(SRC_PATH)
/,
$
(
EXAMPLES:%
$(EXESUF)
=
%.c
))
...
...
tests/Makefile
View file @
7e5bde93
...
@@ -2,7 +2,7 @@ THREADS = 1
...
@@ -2,7 +2,7 @@ THREADS = 1
VREF
=
tests/vsynth1/00.pgm
VREF
=
tests/vsynth1/00.pgm
AREF
=
tests/data/asynth1.sw
AREF
=
tests/data/asynth1.sw
O
BJ
DIRS
+=
tests/data tests/vsynth1 tests/data/filtergraphs
O
UT
DIRS
+=
tests/data tests/vsynth1 tests/data/filtergraphs
$(VREF)
:
tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(VREF)
:
tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)
./
$<
'tests/vsynth1/'
$(M)
./
$<
'tests/vsynth1/'
...
...
tests/checkasm/Makefile
View file @
7e5bde93
...
@@ -30,7 +30,7 @@ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
...
@@ -30,7 +30,7 @@ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
CHECKASMDIRS
:=
$
(
sort
$
(
dir
$(CHECKASMOBJS)
))
CHECKASMDIRS
:=
$
(
sort
$
(
dir
$(CHECKASMOBJS)
))
$(CHECKASMOBJS)
:
| $(CHECKASMDIRS)
$(CHECKASMOBJS)
:
| $(CHECKASMDIRS)
O
BJ
DIRS
+=
$(CHECKASMDIRS)
O
UT
DIRS
+=
$(CHECKASMDIRS)
CHECKASM
:=
tests/checkasm/checkasm
$(EXESUF)
CHECKASM
:=
tests/checkasm/checkasm
$(EXESUF)
...
...
tools/Makefile
View file @
7e5bde93
...
@@ -3,7 +3,7 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws
...
@@ -3,7 +3,7 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws
tools/cws2fws$(EXESUF)
:
ELIBS = $(ZLIB)
tools/cws2fws$(EXESUF)
:
ELIBS = $(ZLIB)
O
BJ
DIRS
+=
tools
O
UT
DIRS
+=
tools
clean
::
clean
::
$(RM)
$
(
CLEANSUFFIXES:%
=
tools/%
)
$(RM)
$
(
CLEANSUFFIXES:%
=
tools/%
)
...
...
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