Index: elkcode/make.inc
===================================================================
--- elkcode.orig/make.inc
+++ elkcode/make.inc
@@ -47,16 +47,16 @@ SRC_LIBXC = libxcifc_stub.f90
 # To enable Libxc first download and compile version 6.x of the library. Next
 # copy the files libxcf03.a and libxc.a to the elk/src directory and uncomment
 # the following lines.
-#LIB_LIBXC = libxcf03.a libxc.a
-#SRC_LIBXC = libxcf03.f90 libxcifc.f90
+LIB_LIBXC = `pkg-config --cflags --libs libxc` -lxcf03
+SRC_LIBXC = libxcifc.f90
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 SRC_W90S = w90_stub.f90
 # To enable the Wannier90 library copy libwannier.a to the elk/src directory and
 # uncomment the following lines.
-#SRC_W90S =
-#LIB_W90 = libwannier.a
+SRC_W90S =
+LIB_W90 = -lwannier
 #-------------------------------------------------------------------------------
 
 
@@ -76,11 +76,11 @@ SRC_W90S = w90_stub.f90
 
 #-------------------------------------------------------------------------------
 # Intel Fortran compiler classic (ifort) version 18 and later.
-F90 = mpiifort
-F90_OPTS = -O3 -xHost -ipo -qopenmp -mkl=parallel
-F90_LIB = -liomp5 -lpthread -lm -ldl
-SRC_MKL =
-AR = xiar
+#F90 = mpiifort
+#F90_OPTS = -O3 -xHost -ipo -qopenmp -mkl=parallel
+#F90_LIB = -liomp5 -lpthread -lm -ldl
+#SRC_MKL =
+#AR = xiar
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
@@ -99,11 +99,14 @@ AR = xiar
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
-# GNU Fortran compiler with OpenBLAS, LAPACK and FFTW.
-#F90 = mpif90
-#F90_OPTS = -Ofast -march=native -mtune=native -fopenmp -ffpe-summary=none -Wno-lto-type-mismatch
-#F90_LIB = -lopenblas -llapack -lfftw3 -lfftw3f
-#SRC_OBLAS =
+# GNU Fortran compiler with BLAS, LAPACK and FFTW.
+F90 = mpif90
+F90_OPTS :=
+F90_OPTS += `dpkg-buildflags --get FFLAGS`
+F90_OPTS += `dpkg-buildflags --get CPPFLAGS`
+F90_OPTS += -I/usr/include -Wall -ffast-math -funroll-loops -fopenmp -fallow-argument-mismatch
+F90_OPTS += `dpkg-buildflags --get LDFLAGS`
+F90_LIB = -lblas -llapack `pkg-config --libs fftw3` `pkg-config --libs fftw3f`
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------