Closed Bug 395059 Opened 12 years ago Closed 12 years ago

Update client.mk to reflect changes from bug 381902

Categories

(Firefox Build System :: General, defect)

x86
macOS
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: bent.mozilla, Assigned: bent.mozilla)

References

Details

Attachments

(2 files, 1 obsolete file)

Update client.mk to reflect changes from bug 381902.

Need to put the new makefiles in the CONFIG_STATUS_DEPS variable.
At the same time, the old mailnews and themes makefiles files can go away from http://mxr.mozilla.org/mozilla/source/client.mk#1020
Attached patch Patch (obsolete) — Splinter Review
This should do it. I pulled out tabs too.
Assignee: nobody → bent.mozilla
Status: NEW → ASSIGNED
Attachment #280263 - Flags: review?(benjamin)
I don't understand why the makefiles.sh need to be in config_status_deps, but confvars.sh does need to be there.
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.
Attachment #280263 - Attachment is obsolete: true
Attachment #280263 - Flags: review?(benjamin)
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?
No, and it shouldn't be necessary as make-makefiles will take care of it.
Attached patch PatchSplinter Review
No longer depend on makefiles, take confvars.sh into account.
Attachment #281108 - Flags: review?(benjamin)
Attachment #281108 - Flags: review?(benjamin)
Attachment #281108 - Flags: review+
Attachment #281108 - Flags: approval1.9+
Fixed.
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
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.
Yeah, probably.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Attachment #296839 - Flags: review?(benjamin) → review+
Comment on attachment 296839 [details] [diff] [review]
Use TOPSRCDIR

braindead simple change to get make to find the correct directory for dependencies.
Attachment #296839 - Flags: approval1.9?
Attachment #296839 - Flags: approval1.9? → approval1.9+
Fixed again, that's jwatt.
Status: REOPENED → RESOLVED
Closed: 12 years ago12 years ago
Resolution: --- → FIXED
(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
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.