Change library order

Author: lauvergn

Ext_Lib/Save_AD_dnSVM-3.1.zip

@@ -5,14 +5,14 @@ EXTLIB_TYPE=$1
 echo "In get_QDUtilLib.sh"
 pwd
 
-SAVE_version=Save_QDUtilLib-0.6
+SAVE_version=Save_QDUtilLib-0.7
 LOC_version=QDUtilLib
 
 rm -rf QDUtilLib* #always remove the link
 
 
 #latest release
- version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.6.zip
+ version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.7.zip
 #latest HEAD version
 #version=https://github.com/lauvergn/QDUtilLib/archive/refs/heads/main.zip
 

Ext_Lib/Save_AD_dnSVM-3.2.zip

@@ -6,7 +6,7 @@ echo "In get_dnSVM.sh"
 pwd
 
 
-SAVE_version=Save_AD_dnSVM-3.1
+SAVE_version=Save_AD_dnSVM-3.2
 LOC_version=AD_dnSVM
 
 
@@ -15,7 +15,7 @@ rm -rf AD_dnSVM* #always remove the link
 
 #latest release
 #latest HEAD version (dev version)
- version=https://github.com/lauvergn/AD_dnSVM/archive/refs/tags/v3.1.zip
+ version=https://github.com/lauvergn/AD_dnSVM/archive/refs/tags/v3.2.zip
 
 
 test -z $EXTLIB_TYPE       &&    curl -LJ $version --output $LOC_version.zip

Ext_Lib/Save_QDUtilLib-0.6.zip renamed to Ext_Lib/Save_QDUtilLib-0.7.zip

@@ -82,7 +82,7 @@ ADMOD_DIR = $(AD_DIR)/OBJ/obj$(ext_obj)
 ADLIBA    = $(AD_DIR)/libAD_dnSVM$(ext_obj).a
 
 EXTMOD_DIR = $(QDMOD_DIR) $(ADMOD_DIR)
-EXTLib     = $(QDLIBA) $(ADLIBA)
+EXTLib     = $(ADLIBA) $(QDLIBA)
 #===============================================================================
 #=================================================================================
 #=================================================================================
@@ -103,19 +103,24 @@ ifeq ($(FFC),gfortran)
   endif
   FFLAGS0 := $(FFLAGS)
 
+  # where to store the .mod files
   FFLAGS +=-J$(MOD_DIR)
 
+  # where to look the .mod files
+  FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)
+
   # some cpreprocessing
   FFLAGS += -cpp $(CPPSHELL_QML)
 
+  FLIB   = $(EXTLib)
   # OS management
   ifeq ($(LLAPACK),1)
     ifeq ($(OS),Darwin)    # OSX
       # OSX libs (included lapack+blas)
-      FLIB = -framework Accelerate
+      FLIB += -framework Accelerate
     else                   # Linux
       # linux libs
-      FLIB = -llapack -lblas
+      FLIB += -llapack -lblas
       #
       # linux libs with mkl and with openmp
       #FLIB = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_gnu_thread
@@ -126,9 +131,6 @@ ifeq ($(FFC),gfortran)
 
   FC_VER = $(shell $(FFC) --version | head -1 )
 
-  FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)
-  FLIB   += $(EXTLib)
-
 endif
 #=================================================================================
 #=================================================================================
@@ -197,10 +199,10 @@ all: $(QMLIBA) $(MAIN).x $(TESTS).x
 #============= Main executable and tests  ======
 #===============================================
 $(MAIN).x: $(OBJ_DIR)/$(MAIN).o $(QMLIBA)
-	$(FFC) $(FFLAGS) -o $(MAIN).x  $(OBJ_DIR)/$(MAIN).o $(FLIB) $(QMLIBA)
+	$(FFC) $(FFLAGS) -o $(MAIN).x  $(OBJ_DIR)/$(MAIN).o $(QMLIBA) $(FLIB)
 
 $(TESTS).x: $(OBJ_DIR)/$(TESTS).o $(QMLIBA)
-	$(FFC) $(FFLAGS) -o $(TESTS).x  $(OBJ_DIR)/$(TESTS).o $(FLIB) $(QMLIBA)
+	$(FFC) $(FFLAGS) -o $(TESTS).x  $(OBJ_DIR)/$(TESTS).o $(QMLIBA) $(FLIB)
 #===============================================
 #============= Library: libQD.a  ===============
 #===============================================
@@ -338,16 +340,18 @@ ifeq ($(FFC),ifort)
     FFLAGS += -qopenmp
   endif
 
-  # lapack management with cpreprocessing
-  FFLAGS += -cpp -D__LAPACK="$(LLAPACK)"
+  # some cpreprocessing
+  FFLAGS += -cpp $(CPPSHELL_QML)
+
+  # where to look the .mod files
   FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)
 
+  FLIB    = $(EXTLib)
   ifeq ($(LLAPACK),1)
     FLIB += -mkl -lpthread
   else
     FLIB += -lpthread
   endif
-  FLIB   += $(EXTLib)
 
   FC_VER = $(shell $(F90) --version | head -1 )