702178 - Remove libxul-rules.mk and libxul-config.mk

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Gregory Szorc [:gps]]

This is a cleanup/low-priority request to remove toolkit/library/libxul-rules.mk.

This file is only included once, by toolkit/library/Makefile.in. Therefore, it makes no sense to exist as a separate file. The contents can easily be rolled into the aforementioned Makefile.

Comment 1

[Gregory Szorc [:gps]]

Looks like libxul-config.mk in the same directory has the same behavior.

Comment 2

[(not currently active) Ted Mielczarek]

I think these files may have been more useful at one point, but we could definitely just fold them in now.

Comment 3

[Gregory Szorc [:gps]]

Attachment: Move libxul-config.mk and libxul-rules.mk into Makefile, v1

This patch simply moves the contents of the extra .mk files inline to toolkit/library/Makefile.in.

There are certainly bits that could be consolidated. I purposefully kept it simple. I can submit a part 2 to perform sanitizing, if requested.

Comment 4

[Gregory Szorc [:gps]]

Comment on attachment 574364 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v1

Build failed on my local machine. Looking into it now...

Comment 5

[Gregory Szorc [:gps]]

Attachment: Move libxul-config.mk and libxul-rules.mk into Makefile, v2

Same as last except I removed references to the deleted .mk files from EXTRA_DEPS. Tree compiles fine now.

Comment 6

[(not currently active) Ted Mielczarek]

Comment on attachment 574382 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v2

Review of attachment 574382 [details] [diff] [review]:
-----------------------------------------------------------------

::: toolkit/library/Makefile.in
@@ +86,5 @@
>  	$(NULL)
>  
> +CPPSRCS += \
> +	nsStaticXULComponents.cpp \
> +	$(NULL)

While you're here, can you at least change the formatting on lines you're changing to two-space indent? You don't have to do a ton of cleanup, but that would be nice.

Comment 7

[Gregory Szorc [:gps]]

https://hg.mozilla.org/projects/build-system/rev/6f76da3f5e2f

Whitespace changes were made post-review. `hg qdiff -w` had no output. Ted declined additional review on IRC.

Comment 8

[Gregory Szorc [:gps]]

https://hg.mozilla.org/mozilla-central/rev/6f76da3f5e2f