From 4e852bf9a591424b25a561cbfb5a183ead8f615f Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 25 Mar 2015 10:54:17 +0100 Subject: [PATCH] Fixed EZFIO.cfg --- src/Makefile.common | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Makefile.common b/src/Makefile.common index 8d1f5bc5..7b63f772 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -131,11 +131,17 @@ endif # Define the EZFIO rules -$(EZFIO): $(wildcard $(QPACKAGE_ROOT)/src/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(wildcard EZ*FIO.cfg) +$(EZFIO): $(wildcard $(QPACKAGE_ROOT)/src/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/EZFIO.cfg) @echo Building EZFIO library - @$(QPACKAGE_ROOT)/scripts/ezfio_interface.py - @cp $(wildcard $(QPACKAGE_ROOT)/src/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(EZFIO_DIR)/config - @cd $(EZFIO_DIR) ; export FC="$(FC)" ; export FCFLAGS="$(FCFLAGS)" ; export IRPF90="$(IRPF90)" ; $(MAKE) ; $(MAKE) Python + @echo =-=-=-=-=-=-=-=-=-=-=- + for dir in $(QPACKAGE_ROOT)/src/*/ ;\ + do \ + cd $$dir && \ + $(QPACKAGE_ROOT)/scripts/ezfio_interface.py && \ + cd .. ;\ + done + cp $(wildcard $(QPACKAGE_ROOT)/src/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(EZFIO_DIR)/config + cd $(EZFIO_DIR) ; export FC="$(FC)" ; export FCFLAGS="$(FCFLAGS)" ; export IRPF90="$(IRPF90)" ; $(MAKE) ; $(MAKE) Python ezfio: $(EZFIO)