Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
b551d82d
Commit
b551d82d
authored
Nov 20, 2012
by
John Koleszar
Committed by
Gerrit Code Review
Nov 20, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge "make: fix dependency generation for flat build tree" into experimental
parents
bbe5e032
2978bb87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
build/make/Makefile
build/make/Makefile
+1
-1
build/make/configure.sh
build/make/configure.sh
+2
-2
No files found.
build/make/Makefile
View file @
b551d82d
...
...
@@ -112,7 +112,7 @@ $(BUILD_PFX)$(call xform_obj_path,$(1))%.c.d: $(1)%.c
$(qexec)
mkdir
-p
$
$(
dir
$$
@
)
$(qexec)$(CC)
$
$(INTERNAL_CFLAGS)
$
$(CFLAGS)
-M
$$
< |
$(fmt_deps)
>
$$
@
$(BUILD_PFX)$(call xform_obj_path,$(1))%.c.o
:
$(1)%.c
$(BUILD_PFX)$(call xform_obj_path
,
$(1))%.c.d
$(BUILD_PFX)$(call xform_obj_path,$(1))%.c.o
:
$(1)%.c
$(
if
$(quiet)
,@echo
" [CC]
$$
@"
)
$(qexec)$(CC)
$
$(INTERNAL_CFLAGS)
$
$(CFLAGS)
-c
-o
$$
@
$$
<
...
...
build/make/configure.sh
View file @
b551d82d
...
...
@@ -435,10 +435,10 @@ RTCD_OPTIONS = ${RTCD_OPTIONS}
EOF
if
enabled rvct
;
then
cat
>>
$1
<<
EOF
fmt_deps = sed -e 's;^__image.axf;
\$
(dir
\$
@)
\$
(notdir
\$
<).o
\$
@;' #hide
fmt_deps = sed -e 's;^__image.axf;
\$
\$
{@:.d=.o}
\$
\$
@;' #hide
EOF
else
cat
>>
$1
<<
EOF
fmt_deps = sed -e 's;^
\(
[a-zA-Z0-9_]*
\)\.
o;
\$
(dir
\$
@)
\1\$
(suffix
\$
<).o
\$
@;'
fmt_deps = sed -e 's;^
\(
[a-zA-Z0-9_]*
\)\.
o;
\$
\$
{@:.d=.o}
\$
\$
@;'
EOF
fi
...
...
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