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
b9d3c378
Commit
b9d3c378
authored
12 years ago
by
Mans Rullgard
Browse files
Options
Downloads
Patches
Plain Diff
build: use COMPILE template for HOSTOBJS
Signed-off-by:
Mans Rullgard
<
mans@mansr.com
>
parent
a758c5e2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
common.mak
+2
-2
2 additions, 2 deletions
common.mak
doc/Makefile
+0
-2
0 additions, 2 deletions
doc/Makefile
tests/Makefile
+0
-3
0 additions, 3 deletions
tests/Makefile
with
3 additions
and
8 deletions
Makefile
+
1
−
1
View file @
b9d3c378
...
@@ -28,7 +28,7 @@ CFLAGS += $(ECFLAGS)
...
@@ -28,7 +28,7 @@ CFLAGS += $(ECFLAGS)
CCFLAGS
=
$(
CPPFLAGS
)
$(
CFLAGS
)
CCFLAGS
=
$(
CPPFLAGS
)
$(
CFLAGS
)
ASFLAGS
:=
$(
CPPFLAGS
)
$(
ASFLAGS
)
ASFLAGS
:=
$(
CPPFLAGS
)
$(
ASFLAGS
)
YASMFLAGS
+=
$(
IFLAGS
)
-I
$(
SRC_PATH
)
/libavutil/x86/
-Pconfig
.asm
YASMFLAGS
+=
$(
IFLAGS
)
-I
$(
SRC_PATH
)
/libavutil/x86/
-Pconfig
.asm
HOSTCFLAGS
+
=
$(
IFLAGS
)
HOSTC
C
FLAGS
=
$(
IFLAGS
)
$(
HOSTCFLAGS
)
LDFLAGS
:=
$(
ALLFFLIBS:%
=
-Llib
%
)
$(
LDFLAGS
)
LDFLAGS
:=
$(
ALLFFLIBS:%
=
-Llib
%
)
$(
LDFLAGS
)
define
COMPILE
define
COMPILE
...
...
This diff is collapsed.
Click to expand it.
common.mak
+
2
−
2
View file @
b9d3c378
...
@@ -33,7 +33,7 @@ checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
...
@@ -33,7 +33,7 @@ checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
alltools
:
$(TOOLS)
alltools
:
$(TOOLS)
$(HOSTOBJS)
:
%.o: %.c
$(HOSTOBJS)
:
%.o: %.c
$(
HOSTCC
)
$(
HOSTCFLAGS
)
-c
-o
$@
$<
$(
call COMPILE,HOSTCC
)
$(HOSTPROGS)
:
%$(HOSTEXESUF): %.o
$(HOSTPROGS)
:
%$(HOSTEXESUF): %.o
$(
HOSTCC
)
$(
HOSTLDFLAGS
)
-o
$@
$<
$(
HOSTLIBS
)
$(
HOSTCC
)
$(
HOSTLDFLAGS
)
-o
$@
$<
$(
HOSTLIBS
)
...
@@ -49,4 +49,4 @@ CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver
...
@@ -49,4 +49,4 @@ CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver
DISTCLEANSUFFIXES
=
*
.pc
DISTCLEANSUFFIXES
=
*
.pc
LIBSUFFIXES
=
*
.a
*
.lib
*
.so
*
.so.
*
*
.dylib
*
.dll
*
.def
*
.dll.a
LIBSUFFIXES
=
*
.a
*
.lib
*
.so
*
.so.
*
*
.dylib
*
.dll
*
.def
*
.dll.a
-include
$(wildcard $(OBJS:.o=.d) $(TESTOBJS:.o=.d))
-include
$(wildcard $(OBJS:.o=.d)
$(HOSTOBJS:.o=.d)
$(TESTOBJS:.o=.d))
This diff is collapsed.
Click to expand it.
doc/Makefile
+
0
−
2
View file @
b9d3c378
...
@@ -17,8 +17,6 @@ documentation: $(DOCS)
...
@@ -17,8 +17,6 @@ documentation: $(DOCS)
TEXIDEP
=
awk
'/^@include/ { printf "$@:
$(
@D
)
/%s\n", $$2 }'
<
$<
>
$(
@:%
=
%.d
)
TEXIDEP
=
awk
'/^@include/ { printf "$@:
$(
@D
)
/%s\n", $$2 }'
<
$<
>
$(
@:%
=
%.d
)
doc/print_options.o
:
libavformat/options_table.h libavcodec/options_table.h
GENTEXI
=
format codec
GENTEXI
=
format codec
GENTEXI
:=
$(
GENTEXI:%
=
doc/avoptions_%.texi
)
GENTEXI
:=
$(
GENTEXI:%
=
doc/avoptions_%.texi
)
...
...
This diff is collapsed.
Click to expand it.
tests/Makefile
+
0
−
3
View file @
b9d3c378
...
@@ -3,9 +3,6 @@ AREF = tests/data/asynth1.sw
...
@@ -3,9 +3,6 @@ AREF = tests/data/asynth1.sw
OBJDIRS
+=
tests/data tests/vsynth1
OBJDIRS
+=
tests/data tests/vsynth1
# Required due to missing automatic dependency tracking for HOSTOBJS.
tests/rotozoom.o tests/videogen.o
:
tests/utils.c
tests/vsynth1/00.pgm
:
tests/videogen$(HOSTEXESUF) | tests/vsynth1
tests/vsynth1/00.pgm
:
tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(
M
)
./
$<
'tests/vsynth1/'
$(
M
)
./
$<
'tests/vsynth1/'
...
...
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