Skip to content

Fix re-compilation on dependency changes in Makefiles #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

Fix re-compilation on dependency changes in Makefiles #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ice_ocean_SIS2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ $(BUILD)/config.status: $(ICEBERGS_BUILD)/libicebergs.a
$(BUILD)/config.status: $(BUILD)/configure
cd $(BUILD) && \
PATH="${PATH}:$(dir $(abspath $(MAKEDEP)))" \
FCFLAGS="${MOM_FCFLAGS}" \
LDFLAGS="${MOM_LDFLAGS}" \
FCFLAGS="$(MOM_FCFLAGS)" \
LDFLAGS="$(MOM_LDFLAGS)" \
./configure -n $(CONFIG_FLAGS)

$(BUILD)/Makefile.in: $(MAKEFILE_IN) | $(BUILD)
Expand Down Expand Up @@ -154,25 +154,25 @@ $(ATMOS_BUILD)/libatmos_null.a: $(FMS_BUILD)/libFMS.a
BUILD=$(abspath $(ATMOS_BUILD)) \
FMS_BUILD=$(abspath $(FMS_BUILD))

$(LAND_BUILD)/libland_null.a: $(wildcard,../src/land_null/*)
$(LAND_BUILD)/libland_null.a: $(wildcard ../src/land_null/*)
$(LAND_BUILD)/libland_null.a: $(FMS_BUILD)/libFMS.a
$(MAKE) -C ../shared/land_null \
BUILD=$(abspath $(LAND_BUILD)) \
FMS_BUILD=$(abspath $(FMS_BUILD))

$(ICE_PARAM_BUILD)/libice_param.a: $(wildcard,../src/ice_param/*)
$(ICE_PARAM_BUILD)/libice_param.a: $(wildcard ../src/ice_param/*)
$(ICE_PARAM_BUILD)/libice_param.a: $(FMS_BUILD)/libFMS.a
$(MAKE) -C ../shared/ice_param \
BUILD=$(abspath $(ICE_PARAM_BUILD)) \
FMS_BUILD=$(abspath $(FMS_BUILD))

$(ICEBERGS_BUILD)/libicebergs.a: $(wildcard,../src/icebergs/src/*)
$(ICEBERGS_BUILD)/libicebergs.a: $(wildcard ../src/icebergs/src/*)
$(ICEBERGS_BUILD)/libicebergs.a: $(FMS_BUILD)/libFMS.a
$(MAKE) -C ../shared/icebergs \
BUILD=$(abspath $(ICEBERGS_BUILD)) \
FMS_BUILD=$(abspath $(FMS_BUILD))

$(FMS_BUILD)/libFMS.a: $(wildcard,$(FMS_CODEBASE)/*/*)
$(FMS_BUILD)/libFMS.a: $(wildcard $(FMS_CODEBASE)/*/*)
$(MAKE) -C ../shared/fms \
BUILD=$(abspath $(FMS_BUILD)) \
CODEBASE=$(abspath $(FMS_CODEBASE))
Expand Down
3 changes: 3 additions & 0 deletions shared/AM2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)

#----
# External Codebase
# NOTE: These are only visible within the GFDL firewall
Expand Down
3 changes: 3 additions & 0 deletions shared/LM3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)

#----
# External Codebase
# NOTE: These are only visible within the GFDL firewall
Expand Down
3 changes: 3 additions & 0 deletions shared/atmos_null/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ FCFLAGS += -I$(abspath $(FMS_BUILD))
LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)
5 changes: 2 additions & 3 deletions shared/config/Libs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MAKEPATH = $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
M4DIR ?= $(MAKEPATH)/../../src/MOM6/ac/m4
MAKEDEP = $(MAKEPATH)/../../src/MOM6/ac/makedep


# `export` disables autoconf defaults; this restores them
CFLAGS ?= -g -O2
FCFLAGS ?= -g -O2
Expand Down Expand Up @@ -39,9 +40,6 @@ MAKEFLAGS += -rR

all: $(BUILD)/$(TARGET)

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call rwildcard,$(CODEBASE),*.h *.c *.inc *.F90)
$(MAKE) -C $(BUILD) $(TARGET)

FORCE:

$(BUILD)/Makefile: $(BUILD)/Makefile.in $(BUILD)/configure
Expand All @@ -66,6 +64,7 @@ $(BUILD):

# Recursive wildcard (finds all files in $1 with suffixes in $2)
rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
find_src_files=$(call rwildcard,$1,*.h *.c *.inc *.f90 *.F90)

.PHONY: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion shared/config/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ SRCDIRS = @SRCDIRS@
.PHONY: depend
depend: Makefile.dep
Makefile.dep:
$(PYTHON) $(MAKEDEP) $(DEFS) -o Makefile.dep -e -x $(LIBTARGET) $(SRCDIRS)
$(PYTHON) $(MAKEDEP) $(DEFS) -o Makefile.dep -e -x $(LIBTARGET) $(CPPFLAGS) $(SRCDIRS)
3 changes: 3 additions & 0 deletions shared/fms/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ CPPFLAGS += -DAU_TEST_KIND_=r8_kind
CPPFLAGS += -DTEST_SVP_KIND_=8

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)
3 changes: 3 additions & 0 deletions shared/ice_param/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ FCFLAGS += -I$(abspath $(FMS_BUILD))
LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)
3 changes: 3 additions & 0 deletions shared/icebergs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ FCFLAGS += -I$(abspath $(FMS_BUILD))
LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)
3 changes: 3 additions & 0 deletions shared/land_null/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ FCFLAGS += -I$(abspath $(FMS_BUILD))
LDFLAGS += -L$(abspath $(FMS_BUILD))

include ../config/Libs.mk

$(BUILD)/$(TARGET): $(BUILD)/Makefile $(call find_src_files,$(CODEBASE))
$(MAKE) -C $(BUILD) $(TARGET)