Makefile cleanup by OlegHahm · Pull Request #471 · RIOT-OS/RIOT

OlegHahm · 2013-12-23T22:40:02Z

fixes Set the correct include path in modules' Makefiles #91
remove redirection Makefile layer in cpu and boards
removed redundant include pathes from Makefiles

miri64 · 2013-12-24T09:15:14Z

Makefile.include

Maybe a subfolder for boards would be good if you want to build for multiple boards without a whole cleanup

I think if you have boards with different architectures (e.g. native and arm) you'll end up with mixed binaries in RIOT/bin as they won't be rebuilt.

Do we envision to have the same board with different MCUs?

Otherwise, I like the idea. This was the way we did it in µkleos.

I thought the BINDIR was where the project is built...

If that is the case:
What I meant is when building a project for different boards (say native and msba2) it leads to different architectures (native and arm) being built. In that case, if BINDIR is not dependent on the board/cpu, only modules would be built for the second board that were not built for the first board.

I'm not sure, if I fully understand your point. Just for clarification:

Current state (before this PR) is that architecture dependent files exist in RIOT/bin, projects/$(PROJECT)/bin and boards/bin. Thus, building the same project for another architecture or building another project for the same architecture almost always require a make clean before.

After this PR every binary goes into projects/$(RPOJECT)/bin - still requiring to call make clean before building the same project for a different architecture, but allowing to build different projects (for the same or a different architecture) without cleaning in between.

What we could do additionally would be to make a subfolder in projects/$(RPOJECT)/bin (e.g. projects/$(RPOJECT)/bin/msba2) containing all .o, .d and .a files and only putting the elf and hex file directly into bin, prefixed with the board, e.g. projects/$(RPOJECT)/bin/msba2-hello_world.hex.

I think board subdirectories would be nice.

OlegHahm · 2013-12-24T15:54:09Z

Would also fix #419 and #305

mehlis · 2013-12-25T15:20:27Z

👍 for $PROJECT/bin/$BOARD/$PROJECTNAME.hex

OlegHahm · 2014-01-03T18:04:39Z

Addressed comments from @mehlis, @authmillenon and @LudwigOrtmann by creating an according subdirectory for the binaries and adding a variable to switch the compiler output on or off.

additional: * exporting include path in sys is mandatory for subfolders * removed duplicate object file in linker call

* do not overwrite CFLAGS in boards Makefile

Instead of muting all compiler and other binutils output by default, introduce a variable to make this behaviour configurable.

OlegHahm · 2014-01-05T15:11:55Z

Will squash, when acked.

OlegHahm · 2014-01-05T15:12:45Z

Just rebased - last 8 commits are new since last comments.

LudwigKnuepfer · 2014-01-06T12:04:06Z

make buildtest for the default project does not show changes =)

Before:

Building for msba2 .. success
Building for wsn430-v1_3b .. success
Building for olimex_lpc2148 .. failed
Building for msb-430h .. success
Building for chronos .. success
Building for msb-430 .. success
Building for pttu .. failed
Building for mbed_lpc1768 .. failed
Building for native .. success
Building for telosb .. success
Building for redbee-econotag .. success
Building for wsn430-v1_4 .. success
Building for avsextrem .. success

After:

Building for msba2 .. success
Building for wsn430-v1_3b .. success
Building for olimex_lpc2148 .. failed
Building for msb-430h .. success
Building for chronos .. success
Building for msb-430 .. success
Building for pttu .. failed
Building for mbed_lpc1768 .. failed
Building for native .. success
Building for telosb .. success
Building for redbee-econotag .. success
Building for wsn430-v1_4 .. success
Building for avsextrem .. success

OlegHahm · 2014-01-07T12:31:28Z

Is this an ACK?

mehlis · 2014-01-07T12:47:21Z

ACK (building for native and msba2 is working)

LudwigKnuepfer · 2014-01-07T13:42:29Z

I can't really review this (I've looked around more or less superficially and wasn't troubled), so I'd say its a NotNACK...

Makefile cleanup

OlegHahm · 2014-01-07T14:30:11Z

Ooops, I was too quick and forgot squashing. Sorry. Will provide a cake at the next developer meeting.

kaspar030 · 2014-01-07T14:57:02Z

No need to squash the cake.

miri64 reviewed Dec 24, 2013
View reviewed changes

ghost assigned miri64 Dec 24, 2013

OlegHahm added 19 commits January 5, 2014 16:11

mute build tools (to be consistent with the rest of the build system)

e6b354d

build everything in the project directory

1e665b4

move include directives from header to C file

8d15713

simplify and unify include pathes

593ee62

additional: * exporting include path in sys is mandatory for subfolders * removed duplicate object file in linker call

correct filename

1de1b2f

simplify include structure for boards

55f31a4

* do not overwrite CFLAGS in boards Makefile

simplified and unified cpu build structure

26c5052

removed redundant include pathes from Makefiles

c7d985d

removed superfluous slash after BINDIR

f8e349f

further Makefile cleanup

02612ff

use proper variables in board Makefiles

c48b34f

create BOARDS subdirectory for binaries

79cff89

muting compiler and binutils optionally

9df07f9

Instead of muting all compiler and other binutils output by default, introduce a variable to make this behaviour configurable.

add basic include pathes by default

8d13f57

fixed typo

1a29682

moved muting "logic" away from application Makefile

cb7de24

added missing mute prefixes in nativenet and shell

775c0de

fixed include path for mbed board

b34e149

repaired includes for ccn_lite

48a5337

OlegHahm added a commit that referenced this pull request Jan 7, 2014

Merge pull request #471 from OlegHahm/makefile_cleanup

b7c209e

Makefile cleanup

OlegHahm merged commit b7c209e into RIOT-OS:master Jan 7, 2014

OlegHahm deleted the makefile_cleanup branch January 7, 2014 14:29

This was referenced Jan 7, 2014

Move binary folder to project folder #305

Closed

boards should use rm -rf to clean up #419

Closed

mehlis mentioned this pull request Jan 7, 2014

Fix ccn includes #477

Merged

OlegHahm mentioned this pull request Jan 8, 2014

Driver includes #482

Merged

OlegHahm mentioned this pull request Feb 3, 2014

Fix net_help include path #603

Merged

Conversation

OlegHahm commented Dec 23, 2013

Uh oh!

miri64 Dec 24, 2013

Choose a reason for hiding this comment

Uh oh!

LudwigKnuepfer Dec 24, 2013

Choose a reason for hiding this comment

Uh oh!

OlegHahm Dec 24, 2013

Choose a reason for hiding this comment

Uh oh!

LudwigKnuepfer Dec 25, 2013

Choose a reason for hiding this comment

Uh oh!

OlegHahm Dec 25, 2013

Choose a reason for hiding this comment

Uh oh!

LudwigKnuepfer Dec 26, 2013

Choose a reason for hiding this comment

Uh oh!

OlegHahm commented Dec 24, 2013

Uh oh!

mehlis commented Dec 25, 2013

Uh oh!

OlegHahm commented Jan 3, 2014

Uh oh!

OlegHahm commented Jan 5, 2014

Uh oh!

OlegHahm commented Jan 5, 2014

Uh oh!

LudwigKnuepfer commented Jan 6, 2014

Uh oh!

OlegHahm commented Jan 7, 2014

Uh oh!

mehlis commented Jan 7, 2014

Uh oh!

LudwigKnuepfer commented Jan 7, 2014

Uh oh!

OlegHahm commented Jan 7, 2014

Uh oh!

kaspar030 commented Jan 7, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants