Merge pull request #497 from cpinte/master

(mcfost) Fixing Makefile

build/Makefile

@@ -133,6 +133,7 @@ ifeq ($(MCFOST), yes)
     else
     #--otherwise assume the source code is lying around somewhere
        MCFOST_LIBS = $(MCFOST_INSTALL)/lib/$(FC)
+       HDF5_DIR	= $(MCFOST_LIBS)
        MCFOST_INCLUDE = $(MCFOST_INSTALL)/include
        ifeq ("X$(MCFOST_LIB)","X")
           MCFOST_LIB = $(MCFOST_DIR)/src
@@ -148,7 +149,6 @@ ifeq ($(MCFOST), yes)
     LDFLAGS+= -I$(MCFOST_INCLUDE) -I$(MCFOST_INCLUDE)/voro++ -I$(MCFOST_INCLUDE)/hdf5 -I$(MCFOST_INCLUDE)/$(FC) \
 	-L$(MCFOST_LIB) -lmcfost -L$(MCFOST_LIBS) $(LIBCXX) -lcfitsio -lvoro++ -lsprng \
    -L$(HDF5_DIR) -lhdf5_fortran -lhdf5 -lz #$(LXGBOOST)
-	#-L$(HDF5_DIR)/lib/Intel -lhdf5_fortran
 endif
 
 include Makefile_systems
@@ -491,7 +491,7 @@ ifdef METRIC
 else
     SRCMETRIC= metric_minkowski.f90
 endif
-SRCGR=inverse4x4.f90 einsteintk_utils.f90 $(SRCMETRIC) metric_tools.f90 utils_gr.f90 interpolate3D.f90 tmunu2grid.f90 
+SRCGR=inverse4x4.f90 einsteintk_utils.f90 $(SRCMETRIC) metric_tools.f90 utils_gr.f90 interpolate3D.f90 tmunu2grid.f90
 #
 # chemistry and cooling
 #
@@ -998,7 +998,7 @@ phantom2mcfost: checkmcfost
         ANALYSISBIN=$@ ANALYSISONLY=yes LDFLAGS="-L$(MCFOST_DIR)/src -lmcfost $(LIBCXX)"
 
 analysis_mcfost.o: analysis_mcfost.f90
-	$(FC) -c $(FFLAGS) -I$(MCFOST_INCLUDE) $< -o $@
+	$(FC) -c $(FFLAGS) -I$(MCFOST_INCLUDE) -I$(MCFOST_DIR)/src $< -o $@
 
 analysis_mcfost.o: checkmcfost