395059 - Update client.mk to reflect changes from bug 381902

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Update client.mk to reflect changes from bug 381902.

Need to put the new makefiles in the CONFIG_STATUS_DEPS variable.

Comment 1

[Robert Kaiser]

At the same time, the old mailnews and themes makefiles files can go away from http://mxr.mozilla.org/mozilla/source/client.mk#1020

Comment 2

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Attachment: Patch

This should do it. I pulled out tabs too.

Comment 3

[Benjamin Smedberg]

I don't understand why the makefiles.sh need to be in config_status_deps, but confvars.sh does need to be there.

Comment 4

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 280263 [details] [diff] [review]
Patch

Hmm... yeah. I was just adding the makefiles to keep the old behavior, but you're right that it doesn't make a whole lot of sense. I'll fix this patch in a bit.

Comment 5

[Robert Kaiser]

well, if it is not there, is configure still re-run to create the needed Makefiles when we add new ones to a makefiles.sh?

Comment 6

[Benjamin Smedberg]

No, and it shouldn't be necessary as make-makefiles will take care of it.

Comment 7

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Attachment: Patch

No longer depend on makefiles, take confvars.sh into account.

Comment 8

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Fixed.

Comment 9

[Jonathan Watt [:jwatt]]

Comment on attachment 281108 [details] [diff] [review]
Patch

>+  $(wildcard $(addsuffix confvars.sh,$(wildcard */))) \

Should this not be:

$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \

See bug 388547 comment 49.

Comment 10

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Yeah, probably.

Comment 11

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Attachment: Use TOPSRCDIR

Comment 12

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 296839 [details] [diff] [review]
Use TOPSRCDIR

braindead simple change to get make to find the correct directory for dependencies.

Comment 13

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Fixed again, that's jwatt.

Comment 14

[[e-mail]]

(In reply to comment #9)
>(From update of attachment 281108 [details] [diff] [review])
>>+  $(wildcard $(addsuffix confvars.sh,$(wildcard */))) \
>Should this not be:
>  $(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
	$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
:-P