diff options
author | John Koleszar <jkoleszar@google.com> | 2010-08-02 10:21:52 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2010-08-02 10:21:55 -0400 |
commit | 4e6827a013084ce3856af969c673e0237ffd5537 (patch) | |
tree | 0c932b867024e7995427e7e010b0d40e6cd00997 | |
parent | 0e8f108fb0c33a509c87f08a870b11d92223e1e4 (diff) | |
download | libvpx-4e6827a013084ce3856af969c673e0237ffd5537.tar libvpx-4e6827a013084ce3856af969c673e0237ffd5537.tar.gz libvpx-4e6827a013084ce3856af969c673e0237ffd5537.tar.bz2 libvpx-4e6827a013084ce3856af969c673e0237ffd5537.zip |
configure: support directories containing .o
Fixes http://code.google.com/p/webm/issues/detail?id=96
The regex which postprocesses the gcc make-deps (-M) output was too
greedy and matching in the dependencies part of the rule rather than
the target only. The patch provided with the issue was not correct, as
it tried to match the .o at the end of the line, which isn't correct
at least for my GCC version. This patch matches word characters
instead of .*
Thanks to raimue and the MacPorts community for isolating this issue.
Change-Id: I28510da2252e03db910c017101d9db12e5945a27
-rwxr-xr-x | build/make/configure.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 35131b07b..3b6c919fd 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -378,7 +378,7 @@ EOF fmt_deps = sed -e 's;^__image.axf;\$(dir \$@)\$(notdir \$<).o \$@;' #hide EOF else cat >> $1 << EOF -fmt_deps = sed -e 's;^\(.*\)\.o;\$(dir \$@)\1\$(suffix \$<).o \$@;' #hide +fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\$(dir \$@)\1\$(suffix \$<).o \$@;' EOF fi |