Skip to content

Makefiles: move all supporting Makefile includes to /makefiles#4699

Merged
aabadie merged 1 commit intoRIOT-OS:masterfrom
jnohlgard:pr/makefile-reorganize
Apr 4, 2017
Merged

Makefiles: move all supporting Makefile includes to /makefiles#4699
aabadie merged 1 commit intoRIOT-OS:masterfrom
jnohlgard:pr/makefile-reorganize

Conversation

@jnohlgard
Copy link
Copy Markdown
Member

@jnohlgard jnohlgard commented Jan 27, 2016

This is a first attempt/proof of concept of #4695

  • make buildtest for tests/periph_* for all platforms succeeded.
  • BUILD_IN_DOCKER=1 make works
  • make flash term tested on mulle

@jnohlgard jnohlgard added Platform: MSP Platform: This PR/issue effects MSP-based platforms Platform: ARM Platform: This PR/issue effects ARM-based platforms State: WIP State: The PR is still work-in-progress and its code is not in its final presentable form yet Area: core Area: RIOT kernel. Handle PRs marked with this with care! CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable Area: build system Area: Build system Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Jan 27, 2016
@jnohlgard jnohlgard mentioned this pull request Jan 27, 2016
Closed
@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from 12ac7ea to 2705b95 Compare February 4, 2016 12:50
@jnohlgard jnohlgard mentioned this pull request Feb 10, 2016
Merged
@miri64
Copy link
Copy Markdown
Member

miri64 commented Mar 6, 2016

What is the status of this PR?

@jnohlgard jnohlgard added the Discussion: RFC The issue/PR is used as a discussion starting point about the item of the issue/PR label Mar 7, 2016
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 7, 2016

Status: Needs massive rebase.

There was not much discussion in the thread #4695 yet.

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch 2 times, most recently from 7e4076e to c37dcb0 Compare March 22, 2016 06:28
@jnohlgard jnohlgard added State: waiting for other PR State: The PR requires another PR to be merged first CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 22, 2016
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 22, 2016

rebased, waiting for #5097, added CI test flag to do a test build on Murdock

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from c37dcb0 to 55071b6 Compare March 22, 2016 06:37
@jnohlgard jnohlgard added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 22, 2016
@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch 2 times, most recently from e57d6a3 to 2f4e796 Compare March 28, 2016 19:06
@miri64 miri64 modified the milestone: Release 2016.07 Mar 29, 2016
@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch 3 times, most recently from bbe34a0 to 608d465 Compare April 6, 2016 05:16
@miri64
Copy link
Copy Markdown
Member

miri64 commented Jun 6, 2016

I think @kaspar030 had an opinion to that, but I would rather have them state it.

@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 24, 2017

Squashed, rebased

@jnohlgard jnohlgard mentioned this pull request Mar 24, 2017
Merged
@kaspar030 kaspar030 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 24, 2017
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 25, 2017

@kaspar030 Murdock is finally green

kaspar030
kaspar030 approved these changes Mar 26, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK. Would someone else give another one?

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented Mar 27, 2017

@gebart One thing I'm realizing just now: previously, we had some Makefiles which where part of a "tree of included Makefiles", named Makefile.include(.*). Everything defined in there was available in all recursive make calls, e.g., those of modules invoked with make -C<module-dir> .... What do you think, does it make sense to keep this information in the filenames? (Maybe use *.inc.mk for those files?)

@miri64
Copy link
Copy Markdown
Member

miri64 commented Mar 29, 2017

Needs rebase now anyways.

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from d4400d1 to 35032eb Compare March 29, 2017 10:47
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 29, 2017

@kaspar030 do you mean that we add the .inc. part to the file names under /makefiles?

@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 29, 2017

btw, rebased

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented Mar 29, 2017

do you mean that we add the .inc. part to the file names under /makefiles?

Yes.

@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 29, 2017

Sure, sounds reasonable

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from 35032eb to d1351bd Compare March 30, 2017 07:03
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Mar 30, 2017

@kaspar030 I renamed the files to .inc.mk, and incorporated the recently added MIPS common Makefile in the /makefiles tree.

OK to squash?

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from d1351bd to 0a6f879 Compare March 30, 2017 07:17
@jnohlgard jnohlgard mentioned this pull request Mar 30, 2017
Closed
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Apr 2, 2017

Since this affects major component of the system, could we get at least one more ACK? Ping @OlegHahm, @miri64, @aabadie, others

@aabadie
Copy link
Copy Markdown
Contributor

aabadie commented Apr 3, 2017

stm32l4 needs to be adapted

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from 0a6f879 to 657604d Compare April 4, 2017 13:02
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Apr 4, 2017

@aabadie rebased, adapted stm32l4

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented Apr 4, 2017

@gebart please squash!

could we get at least one more ACK? Ping @OlegHahm, @miri64, @aabadie, others

ping

@jnohlgard jnohlgard force-pushed the pr/makefile-reorganize branch from 657604d to 339a4da Compare April 4, 2017 13:12
@jnohlgard
Copy link
Copy Markdown
Member Author

jnohlgard commented Apr 4, 2017

squashed
ping @OlegHahm @miri64 @aabadie

aabadie
aabadie approved these changes Apr 4, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK and go :)

@aabadie aabadie merged commit b0f4123 into RIOT-OS:master Apr 4, 2017
@jnohlgard jnohlgard deleted the pr/makefile-reorganize branch April 5, 2017 06:24
@aabadie aabadie mentioned this pull request Apr 6, 2017
Closed
@thomaseichinger thomaseichinger mentioned this pull request Apr 10, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aabadie aabadie aabadie approved these changes

@kaspar030 kaspar030 kaspar030 approved these changes

Assignees

@miri64 miri64

@kaspar030 kaspar030

Labels

Area: build system Area: Build system Area: core Area: RIOT kernel. Handle PRs marked with this with care! CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Platform: MSP Platform: This PR/issue effects MSP-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Milestone

Release 2017.04

Development

Successfully merging this pull request may close these issues.

4 participants

@jnohlgard @miri64 @kaspar030 @aabadie