From 20ed8c923a05f82f7251bc045242e541d79b4050 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 3 Apr 2014 11:28:54 +0200 Subject: [PATCH] Simplified Makefiles --- scripts/create_Makefile.sh | 4 ++-- src/AOs/Makefile | 12 ------------ src/Bitmask/Makefile | 12 ------------ src/Electrons/Makefile | 12 ------------ src/Ezfio_files/Makefile | 12 ------------ src/MOs/Makefile | 12 ------------ src/Makefile | 12 ------------ src/Makefile.common | 15 +++++++++++++++ src/Nuclei/Makefile | 12 ------------ src/Output/Makefile | 12 ------------ src/Utils/Makefile | 12 ------------ 11 files changed, 17 insertions(+), 110 deletions(-) diff --git a/scripts/create_Makefile.sh b/scripts/create_Makefile.sh index b3b96b06..d0e29726 100755 --- a/scripts/create_Makefile.sh +++ b/scripts/create_Makefile.sh @@ -30,7 +30,7 @@ EOF cat << EOF > Makefile default: all -NEEDED_MODULES=$(shell cat NEEDED_MODULES) +NEEDED_MODULES=\$(shell cat NEEDED_MODULES) # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ @@ -45,7 +45,7 @@ include irpf90.make irpf90.make: \$(filter-out IRPF90_temp/%, \$(wildcard */*.irp.f)) \$(wildcard *.irp.f) \$(wildcard *.inc.f) Makefile \$(EZFIO) NEEDED_MODULES \$(IRPF90) -Makefile.depend: Makefile +Makefile.depend: NEEDED_MODULES \$(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh EOF diff --git a/src/AOs/Makefile b/src/AOs/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/AOs/Makefile +++ b/src/AOs/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Bitmask/Makefile b/src/Bitmask/Makefile index 37d4b456..fa91d467 100644 --- a/src/Bitmask/Makefile +++ b/src/Bitmask/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC=bitmasks_module.f90 OBJ=IRPF90_temp/bitmasks_module.o -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Electrons/Makefile b/src/Electrons/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/Electrons/Makefile +++ b/src/Electrons/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Ezfio_files/Makefile b/src/Ezfio_files/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/Ezfio_files/Makefile +++ b/src/Ezfio_files/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/MOs/Makefile b/src/MOs/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/MOs/Makefile +++ b/src/MOs/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Makefile b/src/Makefile index d5d26784..8cca5d71 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,29 +1,17 @@ default: all -NEEDED_MODULES=$(shell cat NEEDED_MODULES) SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make all:$(ALL) -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile NEEDED_MODULES - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh - all_clean: @for i in $(NEEDED_MODULES) ; do cd $$i ; make veryclean ; make clean_links ; cd .. ; done all_modules: $(NEEDED_MODULES) -FORCE: - $(NEEDED_MODULES): FORCE @cd $@ ; unset NEEDED_MODULES INCLUDE_DIRS ; make diff --git a/src/Makefile.common b/src/Makefile.common index f3608a4c..d69e11bd 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -1,7 +1,12 @@ +include $(QPACKAGE_ROOT)/src/Makefile.config ifndef QPACKAGE_ROOT $(error QPACKAGE_ROOT undefined. Run the setup_environment.sh script) endif +NEEDED_MODULES=$(shell cat NEEDED_MODULES) + +include Makefile.depend + NEEDED_MODULES_OK=$(shell X=`$(QPACKAGE_ROOT)/scripts/check_dependencies.sh $(NEEDED_MODULES)` && echo OK || echo $$X) ifneq ($(NEEDED_MODULES_OK),OK) $(info ---------------------) @@ -45,3 +50,13 @@ endif LIB+=$(EZFIO) $(MKL) IRPF90+=$(patsubst %, -I %, $(INCLUDE_DIRS)) +irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES + $(IRPF90) + +Makefile.depend: Makefile + $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh + +include irpf90.make + +FORCE: + diff --git a/src/Nuclei/Makefile b/src/Nuclei/Makefile index 802b4ffb..b2ea1de1 100644 --- a/src/Nuclei/Makefile +++ b/src/Nuclei/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Output/Makefile b/src/Output/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/Output/Makefile +++ b/src/Output/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh diff --git a/src/Utils/Makefile b/src/Utils/Makefile index ad986c3d..b2ea1de1 100644 --- a/src/Utils/Makefile +++ b/src/Utils/Makefile @@ -1,20 +1,8 @@ default: all -# Define here all other modules on which the current module depends -NEEDED_MODULES=$(shell cat NEEDED_MODULES) - # Define here all new external source files and objects.Don't forget to prefix the # object files with IRPF90_temp/ SRC= OBJ= -include Makefile.depend -include $(QPACKAGE_ROOT)/src/Makefile.config include $(QPACKAGE_ROOT)/src/Makefile.common -include irpf90.make - -irpf90.make: $(filter-out IRPF90_temp/%, $(wildcard */*.irp.f)) $(wildcard *.irp.f) $(wildcard *.inc.f) Makefile $(EZFIO) NEEDED_MODULES - $(IRPF90) - -Makefile.depend: Makefile - $(QPACKAGE_ROOT)/scripts/create_Makefile_depend.sh