Move common.mk include into Makefile template; trim legacy fragments#51
Open
alex-robinson wants to merge 1 commit into
Open
Move common.mk include into Makefile template; trim legacy fragments#51alex-robinson wants to merge 1 commit into
alex-robinson wants to merge 1 commit into
Conversation
The Makefile template now `include`s config/common.mk directly, after the <COMPILER_CONFIGURATION> placeholder. Per-host fragments under config/ are trimmed to compiler + machine bits only (FC, NETCDF wiring, FFLAGS / FFLAGS_OPENMP, DFLAGS_*, plus any per-host override such as macbook's LFLAGS_EXTRA= to disable -Wl,-zmuldefs). The shared dependency wiring (FESMUTILS, FFTW, openmp swap, LFLAGS) now lives only in common.mk. The split between FFLAGS (default) and FFLAGS_OPENMP (delta) replaces the in-fragment `ifeq ($(openmp), 1) ... endif` blocks that previously redefined FFLAGS wholesale; common.mk does the append in one place.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The reorganization below will make it easier to keep the legacy config.py method and configme install method in sync with each other - there was a bit of redundancy until now.
The Makefile template now
includes config/common.mk directly, after the <COMPILER_CONFIGURATION> placeholder. Per-host fragments under config/ are trimmed to compiler + machine bits only (FC, NETCDF wiring, FFLAGS / FFLAGS_OPENMP, DFLAGS_*, plus any per-host override such as macbook's LFLAGS_EXTRA= to disable -Wl,-zmuldefs). The shared dependency wiring (FESMUTILS, FFTW, openmp swap, LFLAGS) now lives only in common.mk.The split between FFLAGS (default) and FFLAGS_OPENMP (delta) replaces the in-fragment
ifeq ($(openmp), 1) ... endifblocks that previously redefined FFLAGS wholesale; common.mk does the append in one place.