450651 - Dependencies don't work in media/libtheora/lib

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[[e-mail]]

Our "manual" dependency generation assumes that all object files get created in the same objdir. Actually that's not quite true. Originally rules.mk used $(<D) to strip off the path of the source file. This didn't actually work since mkdepend is a Windows binary and therefore gets passed "Windows" paths but $(<D) is a cygwin/msys path. It was then changed to strip off $(srcdir) and this version would have been compatible with the theora Makefile. However it wasn't compatible with the uriloader/exthandler Makefile and rules.mk was eventually switched to strip paths using a wildcard.

The media/theora/lib Makefile needs to find its source files in the same way that the uriloader/exthandler Makefile so that its dependencies are correct.

Comment 1

[[e-mail]]

Attachment: Proposed patch

Use VPATH instead of manually specifying subfolders

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 333833 [details] [diff] [review]
Proposed patch

+VPATH		:= $(srcdir) $(srcdir)/dec
+ 

Any reason you didn't just put this in the VPATH declaration at the beginning of the file?

Comment 3

[[e-mail]]

Attachment: Removed other VPATH

I tried to base the patch on uriloader/exthandler/Makefile.in but I admit I overlooked the subtlety of that change.

Comment 4

[[e-mail]]

Pushed changeset 8c2ce1c8be08 to mozilla-central (without trailing spaces).