r38617 - in /packages/libxc/trunk/debian: ./ changelog patches/rename-libxc-to-libdftxc rules

dcaliste-guest at users.alioth.debian.org dcaliste-guest at users.alioth.debian.org
Fri Jul 1 10:44:52 UTC 2011


Author: dcaliste-guest
Date: Fri Jul  1 10:44:51 2011
New Revision: 38617

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38617
Log:
Upgrade packaging for last recent 1.1.0 version.

Modified:
    packages/libxc/trunk/debian/   (props changed)
    packages/libxc/trunk/debian/changelog
    packages/libxc/trunk/debian/patches/rename-libxc-to-libdftxc
    packages/libxc/trunk/debian/rules

Propchange: packages/libxc/trunk/debian/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul  1 10:44:51 2011
@@ -1,0 +1,1 @@
+stamp-*

Modified: packages/libxc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libxc/trunk/debian/changelog?rev=38617&op=diff
==============================================================================
--- packages/libxc/trunk/debian/changelog (original)
+++ packages/libxc/trunk/debian/changelog Fri Jul  1 10:44:51 2011
@@ -1,6 +1,6 @@
-libxc (1.0-1) unstable; urgency=low
+libxc (1.1.0-1) unstable; urgency=low
 
-  * Initial packaging from upstream version 1.0 (Closes: #602110).
+  * Initial packaging from upstream version 1.1 (Closes: #602110).
   * Use dpkg-source 3.0 (quilt) format.
   * src/Makefile.am and testsuite/Makefile.am: change library name
     from libxc to libdftxc since libxc is already used internally

Modified: packages/libxc/trunk/debian/patches/rename-libxc-to-libdftxc
URL: http://svn.debian.org/wsvn/debian-science/packages/libxc/trunk/debian/patches/rename-libxc-to-libdftxc?rev=38617&op=diff
==============================================================================
--- packages/libxc/trunk/debian/patches/rename-libxc-to-libdftxc (original)
+++ packages/libxc/trunk/debian/patches/rename-libxc-to-libdftxc Fri Jul  1 10:44:51 2011
@@ -1,4 +1,4 @@
-Description: Upstream changes introduced in version 1.0-1
+Description: Upstream changes introduced in version 1.1.0-1
  * src/Makefile.am and testsuite/Makefile.am: change library name
    from libxc to libdft_xc since libxc is already used internally
    by Xen (see libxen-dev).
@@ -7,7 +7,7 @@
 Author: Damien Caliste <damien.caliste at cea.fr>
 Bug-Debian: http://bugs.debian.org/602110
 Forwarded: no
-Last-Update: 2010-11-23
+Last-Update: 2011-07-01
 
 --- libxc-1.0.orig/build/libxc.pc.in
 +++ libxc-1.0/build/libxc.pc.in
@@ -18,8 +18,8 @@
 -Libs: -L${libdir} -lxc
 +Libs: -L${libdir} -ldft_xc
  Cflags: -I${includedir}
---- libxc-1.0.orig/src/Makefile.am
-+++ libxc-1.0/src/Makefile.am
+--- libxc-1.1.0.orig/src/Makefile.am
++++ libxc-1.1.0/src/Makefile.am
 @@ -19,9 +19,9 @@
  ##
  ## $Id: Makefile.am 2433 2006-09-28 11:06:54Z marques $
@@ -29,12 +29,12 @@
  
 -libxc_la_FUNC_SOURCES = \
 +libdft_xc_la_FUNC_SOURCES = \
+ 	special_functions.c integrate.c util.c mix_func.c functionals.c \
  	lda.c lda_x.c lda_x_1d.c lda_x_2d.c \
- 	lda_c_wigner.c lda_c_rpa.c lda_c_hl.c \
- 	lda_c_vwn.c lda_c_pz.c lda_c_pw.c lda_c_ml1.c lda_xc_teter93.c \
-@@ -42,24 +42,24 @@ libxc_la_FUNC_SOURCES = \
- 	lca.c lca_omc.c lca_lch.c \
- 	mix_func.c special_functions.c integrate.c util.c functionals.c 
+ 	lda_c_wigner.c lda_c_gombas.c lda_c_rpa.c lda_c_hl.c \
+@@ -44,24 +44,24 @@ libxc_la_FUNC_SOURCES = \
+ 	mgga_c_tpss.c mgga_x_2d_prhg07.c \
+ 	lca.c lca_omc.c lca_lch.c
  
 -libxc_la_FUNC_SINGLE_SOURCES = $(libxc_la_FUNC_SOURCES:.c=_s.c)
 +libdft_xc_la_FUNC_SINGLE_SOURCES = $(libdft_xc_la_FUNC_SOURCES:.c=_s.c)
@@ -64,1425 +64,138 @@
  LTFCCOMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(FC) $(AM_FCFLAGS) $(FCFLAGS)
  FCLINK = $(LIBTOOL) --mode=link --tag=F77 $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
          $(AM_LDFLAGS) $(LDFLAGS) -o $@
---- libxc-1.0.orig/testsuite/Makefile.am
-+++ libxc-1.0/testsuite/Makefile.am
-@@ -24,11 +24,11 @@ dist_noinst_SCRIPTS = xc-run_testsuite x
- #TESTS = xc-run_testsuite
- 
- xc_get_data_SOURCES = xc-get_data.c
--xc_get_data_LDADD = -L../src/ -lxc -lm
-+xc_get_data_LDADD = -L../src/ -ldft_xc -lm
- xc_get_data_CPPFLAGS = -I$(srcdir)/../src/ -I$(top_builddir)/src
- 
- xc_consistency_SOURCES = xc-consistency.c
--xc_consistency_LDADD = -L../src/ -lxc -lm
-+xc_consistency_LDADD = -L../src/ -ldft_xc -lm
- xc_consistency_CPPFLAGS = -I$(srcdir)/../src/ -I$(top_builddir)/src
- 
- dist_noinst_DATA =         \
---- libxc-1.0.orig/configure
-+++ libxc-1.0/configure
-@@ -1,13 +1,13 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for libxc 1.0.
-+# Generated by GNU Autoconf 2.67 for libxc 1.0.
- #
- # Report bugs to <octopus-users at tddft.org>.
- #
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
--# Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-+# Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -359,19 +359,19 @@ else
- fi # as_fn_arith
- 
- 
--# as_fn_error ERROR [LINENO LOG_FD]
--# ---------------------------------
-+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-+# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with status $?, using 1 if that was 0.
-+# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$?; test $as_status -eq 0 && as_status=1
--  if test "$3"; then
--    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  as_status=$1; test $as_status -eq 0 && as_status=1
-+  if test "$4"; then
-+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
--  $as_echo "$as_me: error: $1" >&2
-+  $as_echo "$as_me: error: $2" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
- exec 6>&1
- 
- # Name of the host.
--# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
-@@ -958,8 +958,9 @@ do
-   fi
- 
-   case $ac_option in
--  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *)	ac_optarg=yes ;;
-+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *=)   ac_optarg= ;;
-+  *)    ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1004,7 +1005,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid feature name: $ac_useropt"
-+      as_fn_error $? "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1030,7 +1031,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid feature name: $ac_useropt"
-+      as_fn_error $? "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1234,7 +1235,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid package name: $ac_useropt"
-+      as_fn_error $? "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1250,7 +1251,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid package name: $ac_useropt"
-+      as_fn_error $? "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1280,8 +1281,8 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) as_fn_error "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information."
-+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information"
-     ;;
- 
-   *=*)
-@@ -1289,7 +1290,7 @@ Try \`$0 --help' for more information."
-     # Reject names that are not valid shell variable names.
-     case $ac_envvar in #(
-       '' | [0-9]* | *[!_$as_cr_alnum]* )
--      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-     esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
-@@ -1307,13 +1308,13 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  as_fn_error "missing argument to $ac_option"
-+  as_fn_error $? "missing argument to $ac_option"
- fi
- 
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
--    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1336,7 +1337,7 @@ do
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1350,8 +1351,8 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used." >&2
-+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used" >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1366,9 +1367,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  as_fn_error "working directory cannot be determined"
-+  as_fn_error $? "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  as_fn_error "pwd does not report name of working directory"
-+  as_fn_error $? "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1407,11 +1408,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1451,7 +1452,7 @@ Configuration:
-       --help=short        display options specific to this package
-       --help=recursive    display the short help of all the included packages
-   -V, --version           display version information and exit
--  -q, --quiet, --silent   do not print \`checking...' messages
-+  -q, --quiet, --silent   do not print \`checking ...' messages
-       --cache-file=FILE   cache test results in FILE [disabled]
-   -C, --config-cache      alias for \`--cache-file=config.cache'
-   -n, --no-create         do not create output files
-@@ -1612,9 +1613,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- libxc configure 1.0
--generated by GNU Autoconf 2.65
-+generated by GNU Autoconf 2.67
- 
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1718,7 +1719,7 @@ ac_fn_c_check_header_compile ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1761,7 +1762,7 @@ $as_echo "$ac_try_echo"; } >&5
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -1827,7 +1828,7 @@ ac_fn_c_check_func ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2152,7 +2153,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by libxc $as_me 1.0, which was
--generated by GNU Autoconf 2.65.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2262,11 +2263,9 @@ trap 'exit_status=$?
-   {
-     echo
- 
--    cat <<\_ASBOX
--## ---------------- ##
-+    $as_echo "## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##
--_ASBOX
-+## ---------------- ##"
-     echo
-     # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2300,11 +2299,9 @@ $as_echo "$as_me: WARNING: cache variabl
- )
-     echo
- 
--    cat <<\_ASBOX
--## ----------------- ##
-+    $as_echo "## ----------------- ##
- ## Output variables. ##
--## ----------------- ##
--_ASBOX
-+## ----------------- ##"
-     echo
-     for ac_var in $ac_subst_vars
-     do
-@@ -2317,11 +2314,9 @@ _ASBOX
-     echo
- 
-     if test -n "$ac_subst_files"; then
--      cat <<\_ASBOX
--## ------------------- ##
-+      $as_echo "## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##
--_ASBOX
-+## ------------------- ##"
-       echo
-       for ac_var in $ac_subst_files
-       do
-@@ -2335,11 +2330,9 @@ _ASBOX
-     fi
- 
-     if test -s confdefs.h; then
--      cat <<\_ASBOX
--## ----------- ##
-+      $as_echo "## ----------- ##
- ## confdefs.h. ##
--## ----------- ##
--_ASBOX
-+## ----------- ##"
-       echo
-       cat confdefs.h
-       echo
-@@ -2394,7 +2387,12 @@ _ACEOF
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  ac_site_file1=$CONFIG_SITE
-+  # We do not want a PATH search for config.site.
-+  case $CONFIG_SITE in #((
-+    -*)  ac_site_file1=./$CONFIG_SITE;;
-+    */*) ac_site_file1=$CONFIG_SITE;;
-+    *)   ac_site_file1=./$CONFIG_SITE;;
-+  esac
- elif test "x$prefix" != xNONE; then
-   ac_site_file1=$prefix/share/config.site
-   ac_site_file2=$prefix/etc/config.site
-@@ -2409,7 +2407,11 @@ do
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
--    . "$ac_site_file"
-+    . "$ac_site_file" \
-+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "failed to load site script $ac_site_file
-+See \`config.log' for more details" "$LINENO" 5 ; }
-   fi
- done
- 
-@@ -2485,7 +2487,7 @@ if $ac_cache_corrupted; then
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2503,16 +2505,22 @@ am__api_version='1.11'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  for ac_t in install-sh install.sh shtool; do
--    if test -f "$ac_dir/$ac_t"; then
--      ac_aux_dir=$ac_dir
--      ac_install_sh="$ac_aux_dir/$ac_t -c"
--      break 2
--    fi
--  done
-+  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
- done
- if test -z "$ac_aux_dir"; then
--  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -2628,11 +2636,11 @@ am_lf='
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2654,7 +2662,7 @@ if (
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-       # broken ls alias from the environment.  This has actually
-       # happened.  Such a system could not be considered "sane".
--      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" "$LINENO" 5
-    fi
- 
-@@ -2664,7 +2672,7 @@ then
-    # Ok.
-    :
- else
--   as_fn_error "newly created file is older than distributed files!
-+   as_fn_error $? "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2902,7 +2910,7 @@ done
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -2910,7 +2918,7 @@ SHELL = /bin/sh
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
-   *@@@%%%=?*=@@@%%%*)
-     eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2944,7 +2952,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-   fi
- fi
- 
-@@ -3035,7 +3043,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
- 
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
-@@ -3046,16 +3054,16 @@ else
- test "x$ac_build_alias" = x &&
-   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
--  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -3080,7 +3088,7 @@ else
-   ac_cv_host=$ac_cv_build
- else
-   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
--    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
- 
- fi
-@@ -3088,7 +3096,7 @@ fi
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -3466,8 +3474,8 @@ fi
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "no acceptable C compiler found in \$PATH
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3581,9 +3589,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ as_fn_set_status 77
--as_fn_error "C compiler cannot create executables
--See \`config.log' for more details." "$LINENO" 5; }; }
-+as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -3625,8 +3632,8 @@ done
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3683,9 +3690,9 @@ $as_echo "$ac_try_echo"; } >&5
-     else
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
-+as_fn_error $? "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-     fi
-   fi
- fi
-@@ -3736,8 +3743,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -4141,7 +4148,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_SED"; then
--    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-   fi
- else
-   ac_cv_path_SED=$SED
-@@ -4217,7 +4224,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
-@@ -4283,7 +4290,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4350,7 +4357,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_FGREP"; then
--    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_FGREP=$FGREP
-@@ -4466,7 +4473,7 @@ else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -4668,13 +4675,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4671: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4678: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4674: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4681: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4677: output\"" >&5)
-+  (eval echo "\"\$as_me:4684: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -5880,7 +5887,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 5883 "configure"' > conftest.$ac_ext
-+  echo '#line 5890 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6669,7 +6676,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -6685,11 +6692,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -6728,7 +6735,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -6744,18 +6751,18 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- 
- ac_ext=c
-@@ -6884,8 +6891,7 @@ do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--eval as_val=\$$as_ac_Header
--   if test "x$as_val" = x""yes; then :
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -7410,11 +7416,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7413: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7419: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7417: \$? = $ac_status" >&5
-+   echo "$as_me:7423: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7749,11 +7755,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7758: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7756: \$? = $ac_status" >&5
-+   echo "$as_me:7762: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7854,11 +7860,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7857: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7863: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7861: \$? = $ac_status" >&5
-+   echo "$as_me:7867: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -7909,11 +7915,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7912: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7918: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7916: \$? = $ac_status" >&5
-+   echo "$as_me:7922: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10279,7 +10285,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10282 "configure"
-+#line 10288 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10375,7 +10381,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10378 "configure"
-+#line 10384 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10904,8 +10910,8 @@ fi
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "no acceptable C compiler found in \$PATH
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -11281,7 +11287,7 @@ $as_echo_n "checking whether cc understa
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11681,8 +11687,7 @@ if test $ac_cv_os_cray = yes; then
-   for ac_func in _getb67 GETB67 getb67; do
-     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--eval as_val=\$$as_ac_var
--   if test "x$as_val" = x""yes; then :
-+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define CRAY_STACKSEG_END $ac_func
-@@ -11761,9 +11766,8 @@ else
-   if test "$ac_cv_type_voidp" = yes; then
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ as_fn_set_status 77
--as_fn_error "cannot compute sizeof (void*)
--See \`config.log' for more details." "$LINENO" 5; }; }
-+as_fn_error 77 "cannot compute sizeof (void*)
-+See \`config.log' for more details" "$LINENO" 5 ; }
-    else
-      ac_cv_sizeof_voidp=0
-    fi
-@@ -11809,7 +11813,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-+  for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -11853,7 +11857,7 @@ fi
- fi
- if test -z "$FC"; then
-   ac_ct_FC=$FC
--  for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-+  for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -12016,7 +12020,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-+  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -12060,7 +12064,7 @@ fi
- fi
- if test -z "$FC"; then
-   ac_ct_FC=$FC
--  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
-+  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -12814,11 +12818,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12817: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12821: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12821: \$? = $ac_status" >&5
-+   echo "$as_me:12825: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -12913,11 +12917,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12916: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12920: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12920: \$? = $ac_status" >&5
-+   echo "$as_me:12924: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12965,11 +12969,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12968: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12972: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12972: \$? = $ac_status" >&5
-+   echo "$as_me:12976: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14836,7 +14840,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-   if test x"$FC" = x; then
--    as_fn_error "could not find Fortran 90 compiler" "$LINENO" 5
-+    as_fn_error $? "could not find Fortran 90 compiler" "$LINENO" 5
-   fi
- 
-   ac_ext=${ac_fc_srcext-f}
-@@ -14876,7 +14880,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_srcext_f90" >&5
- $as_echo "$ac_cv_fc_srcext_f90" >&6; }
- if test "x$ac_cv_fc_srcext_f90" = xunknown; then
--  as_fn_error "Fortran could not compile .f90 files" "$LINENO" 5
-+  as_fn_error $? "Fortran could not compile .f90 files" "$LINENO" 5
- else
-   ac_fc_srcext=f90
-   if test "x$ac_cv_fc_srcext_f90" = xnone; then
-@@ -15196,7 +15200,7 @@ fi
- 	  ;;
- 	  # Ignore these flags.
- 	-lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
--	  |-LANG:=* | -LIST:* | -LNO:*)
-+	  |-LANG:=* | -LIST:* | -LNO:* | -link)
- 	  ;;
- 	-lkernel32)
- 	  test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg"
-@@ -15389,8 +15393,8 @@ fi
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "linking to Fortran libraries from C fails
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "linking to Fortran libraries from C fails
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- 
- ac_ext=${ac_fc_srcext-f}
-@@ -15550,8 +15554,8 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot compile a simple Fortran program
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot compile a simple Fortran program
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-@@ -15801,7 +15805,7 @@ EOF
-     echo "configure: failed program was:" >&5
-     cat ccfortranint.c >&5
-     rm -f ccfortranint*
--    as_fn_error "failed to compile C program to find the C type of a Fortran integer" "$LINENO" 5
-+    as_fn_error $? "failed to compile C program to find the C type of a Fortran integer" "$LINENO" 5
-   fi
-   ac_ccfortranint=`./ccfortranint.x`;
-   rm -f ccfortranint*
-@@ -15948,6 +15952,7 @@ DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
-+U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -15971,31 +15976,31 @@ else
- fi
- 
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  as_fn_error "conditional \"AMDEP\" was never defined.
-+  as_fn_error $? "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_FORTRAN_TRUE}" && test -z "${ENABLE_FORTRAN_FALSE}"; then
--  as_fn_error "conditional \"ENABLE_FORTRAN\" was never defined.
-+  as_fn_error $? "conditional \"ENABLE_FORTRAN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${F90_MOD_UPPERCASE_TRUE}" && test -z "${F90_MOD_UPPERCASE_FALSE}"; then
--  as_fn_error "conditional \"F90_MOD_UPPERCASE\" was never defined.
-+  as_fn_error $? "conditional \"F90_MOD_UPPERCASE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${COMPILE_FORTRAN_TRUE}" && test -z "${COMPILE_FORTRAN_FALSE}"; then
--  as_fn_error "conditional \"COMPILE_FORTRAN\" was never defined.
-+  as_fn_error $? "conditional \"COMPILE_FORTRAN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${COMPILE_SINGLE_TRUE}" && test -z "${COMPILE_SINGLE_FALSE}"; then
--  as_fn_error "conditional \"COMPILE_SINGLE\" was never defined.
-+  as_fn_error $? "conditional \"COMPILE_SINGLE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
-@@ -16145,19 +16150,19 @@ export LANGUAGE
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- 
--# as_fn_error ERROR [LINENO LOG_FD]
--# ---------------------------------
-+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-+# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with status $?, using 1 if that was 0.
-+# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$?; test $as_status -eq 0 && as_status=1
--  if test "$3"; then
--    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  as_status=$1; test $as_status -eq 0 && as_status=1
-+  if test "$4"; then
-+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
--  $as_echo "$as_me: error: $1" >&2
-+  $as_echo "$as_me: error: $2" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -16353,7 +16358,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -16407,7 +16412,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by libxc $as_me 1.0, which was
--generated by GNU Autoconf 2.65.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -16473,10 +16478,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- libxc config.status 1.0
--configured by $0, generated by GNU Autoconf 2.65,
-+configured by $0, generated by GNU Autoconf 2.67,
-   with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -16494,11 +16499,16 @@ ac_need_defaults=:
- while test $# != 0
- do
-   case $1 in
--  --*=*)
-+  --*=?*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
-+  --*=)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=
-+    ac_shift=:
-+    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -16520,6 +16530,7 @@ do
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -16532,7 +16543,7 @@ do
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    as_fn_error "ambiguous option: \`$1'
-+    as_fn_error $? "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-@@ -16541,7 +16552,7 @@ Try \`$0 --help' for more information.";
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) as_fn_error "unrecognized option: \`$1'
-+  -*) as_fn_error $? "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
- 
-   *) as_fn_append ac_config_targets " $1"
-@@ -16956,7 +16967,7 @@ do
-     "build/libxc.pc") CONFIG_FILES="$CONFIG_FILES build/libxc.pc" ;;
-     "build/libxc.spec") CONFIG_FILES="$CONFIG_FILES build/libxc.spec" ;;
- 
--  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-   esac
- done
- 
-@@ -16994,7 +17005,7 @@ $debug ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -17011,7 +17022,7 @@ if test "x$ac_cr" = x; then
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\r'
-+  ac_cs_awk_cr='\\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
-@@ -17025,18 +17036,18 @@ _ACEOF
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
--  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
--    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -17125,20 +17136,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/
--s/:*\${srcdir}:*/:/
--s/:*@srcdir@:*/:/
--s/^\([^=]*=[	 ]*\):*/\1/
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-+h
-+s///
-+s/^/:/
-+s/[	 ]*$/:/
-+s/:\$(srcdir):/:/g
-+s/:\${srcdir}:/:/g
-+s/:@srcdir@:/:/g
-+s/^:*//
- s/:*$//
-+x
-+s/\(=[	 ]*\).*/\1/
-+G
-+s/\n//
- s/^[^=]*=[	 ]*$//
- }'
- fi
-@@ -17166,7 +17185,7 @@ for ac_last_try in false false :; do
-   if test -z "$ac_t"; then
-     break
-   elif $ac_last_try; then
--    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -17251,7 +17270,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -17264,7 +17283,7 @@ do
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -17292,7 +17311,7 @@ do
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -17319,7 +17338,7 @@ $as_echo "$as_me: creating $ac_file" >&6
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-     esac
-     ;;
-   esac
-@@ -17456,22 +17475,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
--  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined." >&5
-+which seems to be undefined.  Please make sure it is defined" >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined." >&2;}
-+which seems to be undefined.  Please make sure it is defined" >&2;}
- 
-   rm -f "$tmp/stdin"
-   case $ac_file in
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-   esac \
--  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -17482,19 +17501,19 @@ which seems to be undefined.  Please mak
-       $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-     } >"$tmp/config.h" \
--      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
-       mv "$tmp/config.h" "$ac_file" \
--	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || as_fn_error "could not create -" "$LINENO" 5
-+      || as_fn_error $? "could not create -" "$LINENO" 5
-   fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -18446,7 +18465,7 @@ _ACEOF
- ac_clean_files=$ac_clean_files_save
- 
- test $ac_write_fail = 0 ||
--  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -18467,7 +18486,7 @@ if test "$no_create" != yes; then
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || as_fn_exit $?
-+  $ac_cs_success || as_fn_exit 1
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
---- libxc-1.0.orig/aclocal.m4
-+++ libxc-1.0/aclocal.m4
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
--[m4_warning([this file was generated for autoconf 2.65.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-+[m4_warning([this file was generated for autoconf 2.67.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
---- libxc-1.0.orig/src/Makefile.in
-+++ libxc-1.0/src/Makefile.in
-@@ -85,8 +85,8 @@ am__base_list = \
+--- libxc-1.1.0.orig/src/Makefile.in
++++ libxc-1.1.0/src/Makefile.in
+@@ -82,8 +82,8 @@ am__base_list = \
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
  	"$(DESTDIR)$(includedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
 -libxc_la_LIBADD =
--am__libxc_la_SOURCES_DIST = lda.c lda_x.c lda_x_1d.c lda_x_2d.c \
+-am__libxc_la_SOURCES_DIST = special_functions.c integrate.c util.c \
 +libdft_xc_la_LIBADD =
-+am__libdft_xc_la_SOURCES_DIST = lda.c lda_x.c lda_x_1d.c lda_x_2d.c \
- 	lda_c_wigner.c lda_c_rpa.c lda_c_hl.c lda_c_vwn.c lda_c_pz.c \
- 	lda_c_pw.c lda_c_ml1.c lda_xc_teter93.c lda_c_1d_csc.c \
- 	lda_c_2d_amgb.c lda_c_2d_prm.c gga.c gga_x_lg93.c gga_x_pbe.c \
-@@ -103,88 +103,95 @@ am__libxc_la_SOURCES_DIST = lda.c lda_x.
- 	mgga_x_m06l.c mgga_x_tau_hcth.c mgga_c_tpss.c lca.c lca_omc.c \
- 	lca_lch.c mix_func.c special_functions.c integrate.c util.c \
- 	functionals.c xc_f.c libxc_funcs.f90 libxc.f90
--am__objects_1 = libxc_la-lda.lo libxc_la-lda_x.lo libxc_la-lda_x_1d.lo \
++am__libdft_xc_la_SOURCES_DIST = special_functions.c integrate.c util.c \
+ 	mix_func.c functionals.c lda.c lda_x.c lda_x_1d.c lda_x_2d.c \
+ 	lda_c_wigner.c lda_c_gombas.c lda_c_rpa.c lda_c_hl.c \
+ 	lda_c_vwn.c lda_c_pz.c lda_c_pw.c lda_c_ml1.c lda_xc_teter93.c \
+@@ -103,98 +103,107 @@ am__libxc_la_SOURCES_DIST = special_func
+ 	mgga_x_m06l.c mgga_x_tau_hcth.c mgga_c_tpss.c \
+ 	mgga_x_2d_prhg07.c lca.c lca_omc.c lca_lch.c xc_f.c \
+ 	libxc_funcs.f90 libxc.f90
+-am__objects_1 = libxc_la-special_functions.lo libxc_la-integrate.lo \
+-	libxc_la-util.lo libxc_la-mix_func.lo libxc_la-functionals.lo \
+-	libxc_la-lda.lo libxc_la-lda_x.lo libxc_la-lda_x_1d.lo \
 -	libxc_la-lda_x_2d.lo libxc_la-lda_c_wigner.lo \
--	libxc_la-lda_c_rpa.lo libxc_la-lda_c_hl.lo \
--	libxc_la-lda_c_vwn.lo libxc_la-lda_c_pz.lo \
--	libxc_la-lda_c_pw.lo libxc_la-lda_c_ml1.lo \
--	libxc_la-lda_xc_teter93.lo libxc_la-lda_c_1d_csc.lo \
--	libxc_la-lda_c_2d_amgb.lo libxc_la-lda_c_2d_prm.lo \
--	libxc_la-gga.lo libxc_la-gga_x_lg93.lo libxc_la-gga_x_pbe.lo \
+-	libxc_la-lda_c_gombas.lo libxc_la-lda_c_rpa.lo \
+-	libxc_la-lda_c_hl.lo libxc_la-lda_c_vwn.lo \
+-	libxc_la-lda_c_pz.lo libxc_la-lda_c_pw.lo \
+-	libxc_la-lda_c_ml1.lo libxc_la-lda_xc_teter93.lo \
+-	libxc_la-lda_c_1d_csc.lo libxc_la-lda_c_2d_amgb.lo \
+-	libxc_la-lda_c_2d_prm.lo libxc_la-lda_k_tf.lo libxc_la-gga.lo \
+-	libxc_la-gga_x_lg93.lo libxc_la-gga_x_pbe.lo \
 -	libxc_la-gga_x_rpbe.lo libxc_la-gga_x_pbea.lo \
--	libxc_la-gga_x_mpbe.lo libxc_la-gga_x_b86.lo \
--	libxc_la-gga_x_b86_mgc.lo libxc_la-gga_x_b88.lo \
--	libxc_la-gga_x_g96.lo libxc_la-gga_x_pw86.lo \
--	libxc_la-gga_x_pw91.lo libxc_la-gga_x_optx.lo \
--	libxc_la-gga_x_dk87.lo libxc_la-gga_x_ft97.lo \
--	libxc_la-gga_x_wc.lo libxc_la-gga_x_am05.lo \
--	libxc_la-gga_x_bayesian.lo libxc_la-gga_perdew.lo \
+-	libxc_la-gga_x_mpbe.lo libxc_la-gga_x_herman.lo \
+-	libxc_la-gga_x_b86.lo libxc_la-gga_x_b86_mgc.lo \
+-	libxc_la-gga_x_b88.lo libxc_la-gga_x_g96.lo \
+-	libxc_la-gga_x_pw86.lo libxc_la-gga_x_pw91.lo \
+-	libxc_la-gga_x_optx.lo libxc_la-gga_x_dk87.lo \
+-	libxc_la-gga_x_ft97.lo libxc_la-gga_x_wc.lo \
+-	libxc_la-gga_x_am05.lo libxc_la-gga_x_bayesian.lo \
+-	libxc_la-gga_x_kt.lo libxc_la-gga_perdew.lo \
 -	libxc_la-gga_c_pbe.lo libxc_la-gga_c_lyp.lo \
 -	libxc_la-gga_c_p86.lo libxc_la-gga_c_pw91.lo \
 -	libxc_la-gga_c_am05.lo libxc_la-gga_c_lm.lo \
--	libxc_la-gga_xc_lb.lo libxc_la-gga_xc_b97.lo \
--	libxc_la-gga_xc_edf1.lo libxc_la-gga_xc_1w.lo \
--	libxc_la-gga_x_2d_b86.lo libxc_la-gga_x_2d_b86_mgc.lo \
--	libxc_la-gga_x_2d_b88.lo libxc_la-gga_x_2d_pbe.lo \
+-	libxc_la-gga_c_wl.lo libxc_la-gga_c_wi.lo libxc_la-gga_x_lb.lo \
+-	libxc_la-gga_xc_b97.lo libxc_la-gga_xc_edf1.lo \
+-	libxc_la-gga_xc_1w.lo libxc_la-gga_x_2d_b86.lo \
+-	libxc_la-gga_x_2d_b86_mgc.lo libxc_la-gga_x_2d_b88.lo \
+-	libxc_la-gga_x_2d_pbe.lo libxc_la-gga_k_tflw.lo \
+-	libxc_la-gga_k_pearson.lo libxc_la-gga_k_ol1.lo \
+-	libxc_la-gga_k_ol2.lo libxc_la-gga_k_dk.lo \
 -	libxc_la-hyb_gga_xc_b3lyp.lo libxc_la-hyb_gga_xc_o3lyp.lo \
 -	libxc_la-hyb_gga_xc_pbeh.lo libxc_la-hyb_gga_xc_b1wc.lo \
 -	libxc_la-hyb_gga_xc_b97.lo libxc_la-mgga.lo \
 -	libxc_la-mgga_x_lta.lo libxc_la-mgga_x_tpss.lo \
 -	libxc_la-mgga_x_br89.lo libxc_la-mgga_xc_vsxc.lo \
 -	libxc_la-mgga_x_m06l.lo libxc_la-mgga_x_tau_hcth.lo \
--	libxc_la-mgga_c_tpss.lo libxc_la-lca.lo libxc_la-lca_omc.lo \
--	libxc_la-lca_lch.lo libxc_la-mix_func.lo \
--	libxc_la-special_functions.lo libxc_la-integrate.lo \
--	libxc_la-util.lo libxc_la-functionals.lo
+-	libxc_la-mgga_c_tpss.lo libxc_la-mgga_x_2d_prhg07.lo \
+-	libxc_la-lca.lo libxc_la-lca_omc.lo libxc_la-lca_lch.lo
 - at COMPILE_FORTRAN_TRUE@am__objects_2 = libxc_la-xc_f.lo \
 - at COMPILE_FORTRAN_TRUE@	libxc_la-libxc_funcs.lo \
 - at COMPILE_FORTRAN_TRUE@	libxc_la-libxc.lo
 -am_libxc_la_OBJECTS = $(am__objects_1) $(am__objects_2)
--am__objects_3 = libxc_la-lda_s.lo libxc_la-lda_x_s.lo \
--	libxc_la-lda_x_1d_s.lo libxc_la-lda_x_2d_s.lo \
--	libxc_la-lda_c_wigner_s.lo libxc_la-lda_c_rpa_s.lo \
+-am__objects_3 = libxc_la-special_functions_s.lo \
+-	libxc_la-integrate_s.lo libxc_la-util_s.lo \
+-	libxc_la-mix_func_s.lo libxc_la-functionals_s.lo \
+-	libxc_la-lda_s.lo libxc_la-lda_x_s.lo libxc_la-lda_x_1d_s.lo \
+-	libxc_la-lda_x_2d_s.lo libxc_la-lda_c_wigner_s.lo \
+-	libxc_la-lda_c_gombas_s.lo libxc_la-lda_c_rpa_s.lo \
 -	libxc_la-lda_c_hl_s.lo libxc_la-lda_c_vwn_s.lo \
 -	libxc_la-lda_c_pz_s.lo libxc_la-lda_c_pw_s.lo \
 -	libxc_la-lda_c_ml1_s.lo libxc_la-lda_xc_teter93_s.lo \
 -	libxc_la-lda_c_1d_csc_s.lo libxc_la-lda_c_2d_amgb_s.lo \
--	libxc_la-lda_c_2d_prm_s.lo libxc_la-gga_s.lo \
--	libxc_la-gga_x_lg93_s.lo libxc_la-gga_x_pbe_s.lo \
--	libxc_la-gga_x_rpbe_s.lo libxc_la-gga_x_pbea_s.lo \
--	libxc_la-gga_x_mpbe_s.lo libxc_la-gga_x_b86_s.lo \
+-	libxc_la-lda_c_2d_prm_s.lo libxc_la-lda_k_tf_s.lo \
+-	libxc_la-gga_s.lo libxc_la-gga_x_lg93_s.lo \
+-	libxc_la-gga_x_pbe_s.lo libxc_la-gga_x_rpbe_s.lo \
+-	libxc_la-gga_x_pbea_s.lo libxc_la-gga_x_mpbe_s.lo \
+-	libxc_la-gga_x_herman_s.lo libxc_la-gga_x_b86_s.lo \
 -	libxc_la-gga_x_b86_mgc_s.lo libxc_la-gga_x_b88_s.lo \
 -	libxc_la-gga_x_g96_s.lo libxc_la-gga_x_pw86_s.lo \
 -	libxc_la-gga_x_pw91_s.lo libxc_la-gga_x_optx_s.lo \
 -	libxc_la-gga_x_dk87_s.lo libxc_la-gga_x_ft97_s.lo \
 -	libxc_la-gga_x_wc_s.lo libxc_la-gga_x_am05_s.lo \
--	libxc_la-gga_x_bayesian_s.lo libxc_la-gga_perdew_s.lo \
--	libxc_la-gga_c_pbe_s.lo libxc_la-gga_c_lyp_s.lo \
--	libxc_la-gga_c_p86_s.lo libxc_la-gga_c_pw91_s.lo \
--	libxc_la-gga_c_am05_s.lo libxc_la-gga_c_lm_s.lo \
--	libxc_la-gga_xc_lb_s.lo libxc_la-gga_xc_b97_s.lo \
--	libxc_la-gga_xc_edf1_s.lo libxc_la-gga_xc_1w_s.lo \
--	libxc_la-gga_x_2d_b86_s.lo libxc_la-gga_x_2d_b86_mgc_s.lo \
--	libxc_la-gga_x_2d_b88_s.lo libxc_la-gga_x_2d_pbe_s.lo \
+-	libxc_la-gga_x_bayesian_s.lo libxc_la-gga_x_kt_s.lo \
+-	libxc_la-gga_perdew_s.lo libxc_la-gga_c_pbe_s.lo \
+-	libxc_la-gga_c_lyp_s.lo libxc_la-gga_c_p86_s.lo \
+-	libxc_la-gga_c_pw91_s.lo libxc_la-gga_c_am05_s.lo \
+-	libxc_la-gga_c_lm_s.lo libxc_la-gga_c_wl_s.lo \
+-	libxc_la-gga_c_wi_s.lo libxc_la-gga_x_lb_s.lo \
+-	libxc_la-gga_xc_b97_s.lo libxc_la-gga_xc_edf1_s.lo \
+-	libxc_la-gga_xc_1w_s.lo libxc_la-gga_x_2d_b86_s.lo \
+-	libxc_la-gga_x_2d_b86_mgc_s.lo libxc_la-gga_x_2d_b88_s.lo \
+-	libxc_la-gga_x_2d_pbe_s.lo libxc_la-gga_k_tflw_s.lo \
+-	libxc_la-gga_k_pearson_s.lo libxc_la-gga_k_ol1_s.lo \
+-	libxc_la-gga_k_ol2_s.lo libxc_la-gga_k_dk_s.lo \
 -	libxc_la-hyb_gga_xc_b3lyp_s.lo libxc_la-hyb_gga_xc_o3lyp_s.lo \
 -	libxc_la-hyb_gga_xc_pbeh_s.lo libxc_la-hyb_gga_xc_b1wc_s.lo \
 -	libxc_la-hyb_gga_xc_b97_s.lo libxc_la-mgga_s.lo \
 -	libxc_la-mgga_x_lta_s.lo libxc_la-mgga_x_tpss_s.lo \
 -	libxc_la-mgga_x_br89_s.lo libxc_la-mgga_xc_vsxc_s.lo \
 -	libxc_la-mgga_x_m06l_s.lo libxc_la-mgga_x_tau_hcth_s.lo \
--	libxc_la-mgga_c_tpss_s.lo libxc_la-lca_s.lo \
--	libxc_la-lca_omc_s.lo libxc_la-lca_lch_s.lo \
--	libxc_la-mix_func_s.lo libxc_la-special_functions_s.lo \
--	libxc_la-integrate_s.lo libxc_la-util_s.lo \
--	libxc_la-functionals_s.lo
-+am__objects_1 = libdft_xc_la-lda.lo libdft_xc_la-lda_x.lo \
+-	libxc_la-mgga_c_tpss_s.lo libxc_la-mgga_x_2d_prhg07_s.lo \
+-	libxc_la-lca_s.lo libxc_la-lca_omc_s.lo libxc_la-lca_lch_s.lo
++am__objects_1 = libdft_xc_la-special_functions.lo \
++	libdft_xc_la-integrate.lo libdft_xc_la-util.lo \
++	libdft_xc_la-mix_func.lo libdft_xc_la-functionals.lo \
++	libdft_xc_la-lda.lo libdft_xc_la-lda_x.lo \
 +	libdft_xc_la-lda_x_1d.lo libdft_xc_la-lda_x_2d.lo \
-+	libdft_xc_la-lda_c_wigner.lo libdft_xc_la-lda_c_rpa.lo \
-+	libdft_xc_la-lda_c_hl.lo libdft_xc_la-lda_c_vwn.lo \
-+	libdft_xc_la-lda_c_pz.lo libdft_xc_la-lda_c_pw.lo \
-+	libdft_xc_la-lda_c_ml1.lo libdft_xc_la-lda_xc_teter93.lo \
-+	libdft_xc_la-lda_c_1d_csc.lo libdft_xc_la-lda_c_2d_amgb.lo \
-+	libdft_xc_la-lda_c_2d_prm.lo libdft_xc_la-gga.lo \
++	libdft_xc_la-lda_c_wigner.lo libdft_xc_la-lda_c_gombas.lo \
++	libdft_xc_la-lda_c_rpa.lo libdft_xc_la-lda_c_hl.lo \
++	libdft_xc_la-lda_c_vwn.lo libdft_xc_la-lda_c_pz.lo \
++	libdft_xc_la-lda_c_pw.lo libdft_xc_la-lda_c_ml1.lo \
++	libdft_xc_la-lda_xc_teter93.lo libdft_xc_la-lda_c_1d_csc.lo \
++	libdft_xc_la-lda_c_2d_amgb.lo libdft_xc_la-lda_c_2d_prm.lo \
++	libdft_xc_la-lda_k_tf.lo libdft_xc_la-gga.lo \
 +	libdft_xc_la-gga_x_lg93.lo libdft_xc_la-gga_x_pbe.lo \
 +	libdft_xc_la-gga_x_rpbe.lo libdft_xc_la-gga_x_pbea.lo \
-+	libdft_xc_la-gga_x_mpbe.lo libdft_xc_la-gga_x_b86.lo \
-+	libdft_xc_la-gga_x_b86_mgc.lo libdft_xc_la-gga_x_b88.lo \
-+	libdft_xc_la-gga_x_g96.lo libdft_xc_la-gga_x_pw86.lo \
-+	libdft_xc_la-gga_x_pw91.lo libdft_xc_la-gga_x_optx.lo \
-+	libdft_xc_la-gga_x_dk87.lo libdft_xc_la-gga_x_ft97.lo \
-+	libdft_xc_la-gga_x_wc.lo libdft_xc_la-gga_x_am05.lo \
-+	libdft_xc_la-gga_x_bayesian.lo libdft_xc_la-gga_perdew.lo \
++	libdft_xc_la-gga_x_mpbe.lo libdft_xc_la-gga_x_herman.lo \
++	libdft_xc_la-gga_x_b86.lo libdft_xc_la-gga_x_b86_mgc.lo \
++	libdft_xc_la-gga_x_b88.lo libdft_xc_la-gga_x_g96.lo \
++	libdft_xc_la-gga_x_pw86.lo libdft_xc_la-gga_x_pw91.lo \
++	libdft_xc_la-gga_x_optx.lo libdft_xc_la-gga_x_dk87.lo \
++	libdft_xc_la-gga_x_ft97.lo libdft_xc_la-gga_x_wc.lo \
++	libdft_xc_la-gga_x_am05.lo libdft_xc_la-gga_x_bayesian.lo \
++	libdft_xc_la-gga_x_kt.lo libdft_xc_la-gga_perdew.lo \
 +	libdft_xc_la-gga_c_pbe.lo libdft_xc_la-gga_c_lyp.lo \
 +	libdft_xc_la-gga_c_p86.lo libdft_xc_la-gga_c_pw91.lo \
 +	libdft_xc_la-gga_c_am05.lo libdft_xc_la-gga_c_lm.lo \
-+	libdft_xc_la-gga_xc_lb.lo libdft_xc_la-gga_xc_b97.lo \
++	libdft_xc_la-gga_c_wl.lo libdft_xc_la-gga_c_wi.lo \
++	libdft_xc_la-gga_x_lb.lo libdft_xc_la-gga_xc_b97.lo \
 +	libdft_xc_la-gga_xc_edf1.lo libdft_xc_la-gga_xc_1w.lo \
 +	libdft_xc_la-gga_x_2d_b86.lo libdft_xc_la-gga_x_2d_b86_mgc.lo \
 +	libdft_xc_la-gga_x_2d_b88.lo libdft_xc_la-gga_x_2d_pbe.lo \
-+	libdft_xc_la-hyb_gga_xc_b3lyp.lo \
++	libdft_xc_la-gga_k_tflw.lo libdft_xc_la-gga_k_pearson.lo \
++	libdft_xc_la-gga_k_ol1.lo libdft_xc_la-gga_k_ol2.lo \
++	libdft_xc_la-gga_k_dk.lo libdft_xc_la-hyb_gga_xc_b3lyp.lo \
 +	libdft_xc_la-hyb_gga_xc_o3lyp.lo \
 +	libdft_xc_la-hyb_gga_xc_pbeh.lo \
 +	libdft_xc_la-hyb_gga_xc_b1wc.lo libdft_xc_la-hyb_gga_xc_b97.lo \
@@ -1490,40 +203,46 @@
 +	libdft_xc_la-mgga_x_tpss.lo libdft_xc_la-mgga_x_br89.lo \
 +	libdft_xc_la-mgga_xc_vsxc.lo libdft_xc_la-mgga_x_m06l.lo \
 +	libdft_xc_la-mgga_x_tau_hcth.lo libdft_xc_la-mgga_c_tpss.lo \
-+	libdft_xc_la-lca.lo libdft_xc_la-lca_omc.lo \
-+	libdft_xc_la-lca_lch.lo libdft_xc_la-mix_func.lo \
-+	libdft_xc_la-special_functions.lo libdft_xc_la-integrate.lo \
-+	libdft_xc_la-util.lo libdft_xc_la-functionals.lo
++	libdft_xc_la-mgga_x_2d_prhg07.lo libdft_xc_la-lca.lo \
++	libdft_xc_la-lca_omc.lo libdft_xc_la-lca_lch.lo
 + at COMPILE_FORTRAN_TRUE@am__objects_2 = libdft_xc_la-xc_f.lo \
 + at COMPILE_FORTRAN_TRUE@	libdft_xc_la-libxc_funcs.lo \
 + at COMPILE_FORTRAN_TRUE@	libdft_xc_la-libxc.lo
 +am_libdft_xc_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-+am__objects_3 = libdft_xc_la-lda_s.lo libdft_xc_la-lda_x_s.lo \
++am__objects_3 = libdft_xc_la-special_functions_s.lo \
++	libdft_xc_la-integrate_s.lo libdft_xc_la-util_s.lo \
++	libdft_xc_la-mix_func_s.lo libdft_xc_la-functionals_s.lo \
++	libdft_xc_la-lda_s.lo libdft_xc_la-lda_x_s.lo \
 +	libdft_xc_la-lda_x_1d_s.lo libdft_xc_la-lda_x_2d_s.lo \
-+	libdft_xc_la-lda_c_wigner_s.lo libdft_xc_la-lda_c_rpa_s.lo \
-+	libdft_xc_la-lda_c_hl_s.lo libdft_xc_la-lda_c_vwn_s.lo \
-+	libdft_xc_la-lda_c_pz_s.lo libdft_xc_la-lda_c_pw_s.lo \
-+	libdft_xc_la-lda_c_ml1_s.lo libdft_xc_la-lda_xc_teter93_s.lo \
++	libdft_xc_la-lda_c_wigner_s.lo libdft_xc_la-lda_c_gombas_s.lo \
++	libdft_xc_la-lda_c_rpa_s.lo libdft_xc_la-lda_c_hl_s.lo \
++	libdft_xc_la-lda_c_vwn_s.lo libdft_xc_la-lda_c_pz_s.lo \
++	libdft_xc_la-lda_c_pw_s.lo libdft_xc_la-lda_c_ml1_s.lo \
++	libdft_xc_la-lda_xc_teter93_s.lo \
 +	libdft_xc_la-lda_c_1d_csc_s.lo libdft_xc_la-lda_c_2d_amgb_s.lo \
-+	libdft_xc_la-lda_c_2d_prm_s.lo libdft_xc_la-gga_s.lo \
-+	libdft_xc_la-gga_x_lg93_s.lo libdft_xc_la-gga_x_pbe_s.lo \
-+	libdft_xc_la-gga_x_rpbe_s.lo libdft_xc_la-gga_x_pbea_s.lo \
-+	libdft_xc_la-gga_x_mpbe_s.lo libdft_xc_la-gga_x_b86_s.lo \
++	libdft_xc_la-lda_c_2d_prm_s.lo libdft_xc_la-lda_k_tf_s.lo \
++	libdft_xc_la-gga_s.lo libdft_xc_la-gga_x_lg93_s.lo \
++	libdft_xc_la-gga_x_pbe_s.lo libdft_xc_la-gga_x_rpbe_s.lo \
++	libdft_xc_la-gga_x_pbea_s.lo libdft_xc_la-gga_x_mpbe_s.lo \
++	libdft_xc_la-gga_x_herman_s.lo libdft_xc_la-gga_x_b86_s.lo \
 +	libdft_xc_la-gga_x_b86_mgc_s.lo libdft_xc_la-gga_x_b88_s.lo \
 +	libdft_xc_la-gga_x_g96_s.lo libdft_xc_la-gga_x_pw86_s.lo \
 +	libdft_xc_la-gga_x_pw91_s.lo libdft_xc_la-gga_x_optx_s.lo \
 +	libdft_xc_la-gga_x_dk87_s.lo libdft_xc_la-gga_x_ft97_s.lo \
 +	libdft_xc_la-gga_x_wc_s.lo libdft_xc_la-gga_x_am05_s.lo \
-+	libdft_xc_la-gga_x_bayesian_s.lo libdft_xc_la-gga_perdew_s.lo \
-+	libdft_xc_la-gga_c_pbe_s.lo libdft_xc_la-gga_c_lyp_s.lo \
-+	libdft_xc_la-gga_c_p86_s.lo libdft_xc_la-gga_c_pw91_s.lo \
-+	libdft_xc_la-gga_c_am05_s.lo libdft_xc_la-gga_c_lm_s.lo \
-+	libdft_xc_la-gga_xc_lb_s.lo libdft_xc_la-gga_xc_b97_s.lo \
-+	libdft_xc_la-gga_xc_edf1_s.lo libdft_xc_la-gga_xc_1w_s.lo \
-+	libdft_xc_la-gga_x_2d_b86_s.lo \
++	libdft_xc_la-gga_x_bayesian_s.lo libdft_xc_la-gga_x_kt_s.lo \
++	libdft_xc_la-gga_perdew_s.lo libdft_xc_la-gga_c_pbe_s.lo \
++	libdft_xc_la-gga_c_lyp_s.lo libdft_xc_la-gga_c_p86_s.lo \
++	libdft_xc_la-gga_c_pw91_s.lo libdft_xc_la-gga_c_am05_s.lo \
++	libdft_xc_la-gga_c_lm_s.lo libdft_xc_la-gga_c_wl_s.lo \
++	libdft_xc_la-gga_c_wi_s.lo libdft_xc_la-gga_x_lb_s.lo \
++	libdft_xc_la-gga_xc_b97_s.lo libdft_xc_la-gga_xc_edf1_s.lo \
++	libdft_xc_la-gga_xc_1w_s.lo libdft_xc_la-gga_x_2d_b86_s.lo \
 +	libdft_xc_la-gga_x_2d_b86_mgc_s.lo \
 +	libdft_xc_la-gga_x_2d_b88_s.lo libdft_xc_la-gga_x_2d_pbe_s.lo \
-+	libdft_xc_la-hyb_gga_xc_b3lyp_s.lo \
++	libdft_xc_la-gga_k_tflw_s.lo libdft_xc_la-gga_k_pearson_s.lo \
++	libdft_xc_la-gga_k_ol1_s.lo libdft_xc_la-gga_k_ol2_s.lo \
++	libdft_xc_la-gga_k_dk_s.lo libdft_xc_la-hyb_gga_xc_b3lyp_s.lo \
 +	libdft_xc_la-hyb_gga_xc_o3lyp_s.lo \
 +	libdft_xc_la-hyb_gga_xc_pbeh_s.lo \
 +	libdft_xc_la-hyb_gga_xc_b1wc_s.lo \
@@ -1532,11 +251,9 @@
 +	libdft_xc_la-mgga_x_br89_s.lo libdft_xc_la-mgga_xc_vsxc_s.lo \
 +	libdft_xc_la-mgga_x_m06l_s.lo \
 +	libdft_xc_la-mgga_x_tau_hcth_s.lo \
-+	libdft_xc_la-mgga_c_tpss_s.lo libdft_xc_la-lca_s.lo \
-+	libdft_xc_la-lca_omc_s.lo libdft_xc_la-lca_lch_s.lo \
-+	libdft_xc_la-mix_func_s.lo libdft_xc_la-special_functions_s.lo \
-+	libdft_xc_la-integrate_s.lo libdft_xc_la-util_s.lo \
-+	libdft_xc_la-functionals_s.lo
++	libdft_xc_la-mgga_c_tpss_s.lo \
++	libdft_xc_la-mgga_x_2d_prhg07_s.lo libdft_xc_la-lca_s.lo \
++	libdft_xc_la-lca_omc_s.lo libdft_xc_la-lca_lch_s.lo
  am__objects_4 = $(am__objects_3)
 - at COMPILE_FORTRAN_TRUE@@COMPILE_SINGLE_TRUE at am__objects_5 =  \
 - at COMPILE_FORTRAN_TRUE@@COMPILE_SINGLE_TRUE@	libxc_la-xc_f_s.lo \
@@ -1557,7 +274,7 @@
  SCRIPTS = $(dist_noinst_SCRIPTS)
  DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -201,8 +208,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+@@ -211,8 +220,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
  	$(LDFLAGS) -o $@
  FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
  FCLD = $(FC)
@@ -1568,7 +285,7 @@
  am__include_HEADERS_DIST = xc.h xc_config.h xc_s.h
  HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \
  	$(noinst_HEADERS)
-@@ -330,8 +337,8 @@ target_alias = @target_alias@
+@@ -342,8 +351,8 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -1576,12 +293,12 @@
 -libxc_la_FUNC_SOURCES = \
 +lib_LTLIBRARIES = libdft_xc.la
 +libdft_xc_la_FUNC_SOURCES = \
+ 	special_functions.c integrate.c util.c mix_func.c functionals.c \
  	lda.c lda_x.c lda_x_1d.c lda_x_2d.c \
- 	lda_c_wigner.c lda_c_rpa.c lda_c_hl.c \
- 	lda_c_vwn.c lda_c_pz.c lda_c_pw.c lda_c_ml1.c lda_xc_teter93.c \
-@@ -352,16 +359,16 @@ libxc_la_FUNC_SOURCES = \
- 	lca.c lca_omc.c lca_lch.c \
- 	mix_func.c special_functions.c integrate.c util.c functionals.c 
+ 	lda_c_wigner.c lda_c_gombas.c lda_c_rpa.c lda_c_hl.c \
+@@ -366,16 +375,16 @@ libxc_la_FUNC_SOURCES = \
+ 	mgga_c_tpss.c mgga_x_2d_prhg07.c \
+ 	lca.c lca_omc.c lca_lch.c
  
 -libxc_la_FUNC_SINGLE_SOURCES = $(libxc_la_FUNC_SOURCES:.c=_s.c)
 -libxc_la_SOURCES = $(libxc_la_FUNC_SOURCES) $(am__append_1)
@@ -1602,7 +319,7 @@
  LTFCCOMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(FC) $(AM_FCFLAGS) $(FCFLAGS)
  FCLINK = $(LIBTOOL) --mode=link --tag=F77 $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \
          $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -448,8 +455,8 @@ clean-libLTLIBRARIES:
+@@ -467,8 +476,8 @@ clean-libLTLIBRARIES:
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
@@ -1613,7 +330,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -457,146 +464,146 @@ mostlyclean-compile:
+@@ -476,170 +485,170 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -1632,6 +349,20 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_pbe_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_pw91.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_pw91_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_wi.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_wi_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_wl.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_c_wl_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_dk.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_dk_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_ol1.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_ol1_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_ol2.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_ol2_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_pearson.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_pearson_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_tflw.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_k_tflw_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_perdew.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_perdew_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_s.Plo at am__quote@
@@ -1659,6 +390,12 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_ft97_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_g96.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_g96_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_herman.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_herman_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_kt.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_kt_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_lb.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_lb_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_lg93.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_lg93_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_x_mpbe.Plo at am__quote@
@@ -1683,8 +420,6 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_xc_b97_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_xc_edf1.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_xc_edf1_s.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_xc_lb.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-gga_xc_lb_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-hyb_gga_xc_b1wc.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-hyb_gga_xc_b1wc_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp.Plo at am__quote@
@@ -1710,6 +445,8 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_2d_amgb_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_2d_prm.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_2d_prm_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_gombas.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_gombas_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_hl.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_hl_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_ml1.Plo at am__quote@
@@ -1724,6 +461,8 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_vwn_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_wigner.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_c_wigner_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_k_tf.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_k_tf_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_x.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-lda_x_1d.Plo at am__quote@
@@ -1737,6 +476,8 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_c_tpss.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_c_tpss_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_s.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_x_2d_prhg07.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_x_2d_prhg07_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_x_br89.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_x_br89_s.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxc_la-mgga_x_lta.Plo at am__quote@
@@ -1772,6 +513,20 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_pbe_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_pw91.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_pw91_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_wi.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_wi_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_wl.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_c_wl_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_dk.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_dk_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_ol1.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_ol1_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_ol2.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_ol2_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_pearson.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_pearson_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_tflw.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_k_tflw_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_perdew.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_perdew_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_s.Plo at am__quote@
@@ -1799,6 +554,12 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_ft97_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_g96.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_g96_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_herman.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_herman_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_kt.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_kt_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_lb.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_lb_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_lg93.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_lg93_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_x_mpbe.Plo at am__quote@
@@ -1823,8 +584,6 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_xc_b97_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_xc_edf1.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_xc_edf1_s.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_xc_lb.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-gga_xc_lb_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-hyb_gga_xc_b1wc.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-hyb_gga_xc_b1wc_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-hyb_gga_xc_b3lyp.Plo at am__quote@
@@ -1850,6 +609,8 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_2d_amgb_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_2d_prm.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_2d_prm_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_gombas.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_gombas_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_hl.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_hl_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_ml1.Plo at am__quote@
@@ -1864,6 +625,8 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_vwn_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_wigner.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_c_wigner_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_k_tf.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_k_tf_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_x.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-lda_x_1d.Plo at am__quote@
@@ -1877,6 +640,8 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_c_tpss.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_c_tpss_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_s.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_x_br89.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_x_br89_s.Plo at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdft_xc_la-mgga_x_lta.Plo at am__quote@
@@ -1900,9 +665,69 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -619,985 +626,985 @@ distclean-compile:
+@@ -662,1153 +671,1153 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+-libxc_la-special_functions.lo: special_functions.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-special_functions.lo -MD -MP -MF $(DEPDIR)/libxc_la-special_functions.Tpo -c -o libxc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-special_functions.Tpo $(DEPDIR)/libxc_la-special_functions.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions.c' object='libxc_la-special_functions.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-special_functions.lo: special_functions.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-special_functions.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-special_functions.Tpo -c -o libdft_xc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-special_functions.Tpo $(DEPDIR)/libdft_xc_la-special_functions.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions.c' object='libdft_xc_la-special_functions.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
+ 
+-libxc_la-integrate.lo: integrate.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-integrate.lo -MD -MP -MF $(DEPDIR)/libxc_la-integrate.Tpo -c -o libxc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-integrate.Tpo $(DEPDIR)/libxc_la-integrate.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate.c' object='libxc_la-integrate.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-integrate.lo: integrate.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-integrate.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-integrate.Tpo -c -o libdft_xc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-integrate.Tpo $(DEPDIR)/libdft_xc_la-integrate.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate.c' object='libdft_xc_la-integrate.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
+ 
+-libxc_la-util.lo: util.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-util.lo -MD -MP -MF $(DEPDIR)/libxc_la-util.Tpo -c -o libxc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-util.Tpo $(DEPDIR)/libxc_la-util.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libxc_la-util.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-util.lo: util.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-util.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-util.Tpo -c -o libdft_xc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-util.Tpo $(DEPDIR)/libdft_xc_la-util.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libdft_xc_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
+ 
+-libxc_la-mix_func.lo: mix_func.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mix_func.lo -MD -MP -MF $(DEPDIR)/libxc_la-mix_func.Tpo -c -o libxc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mix_func.Tpo $(DEPDIR)/libxc_la-mix_func.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func.c' object='libxc_la-mix_func.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-mix_func.lo: mix_func.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mix_func.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mix_func.Tpo -c -o libdft_xc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mix_func.Tpo $(DEPDIR)/libdft_xc_la-mix_func.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func.c' object='libdft_xc_la-mix_func.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
+ 
+-libxc_la-functionals.lo: functionals.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-functionals.lo -MD -MP -MF $(DEPDIR)/libxc_la-functionals.Tpo -c -o libxc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-functionals.Tpo $(DEPDIR)/libxc_la-functionals.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals.c' object='libxc_la-functionals.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-functionals.lo: functionals.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-functionals.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-functionals.Tpo -c -o libdft_xc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-functionals.Tpo $(DEPDIR)/libdft_xc_la-functionals.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals.c' object='libdft_xc_la-functionals.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
  
 -libxc_la-lda.lo: lda.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda.Tpo -c -o libxc_la-lda.lo `test -f 'lda.c' || echo '$(srcdir)/'`lda.c
@@ -1964,6 +789,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_wigner.lo `test -f 'lda_c_wigner.c' || echo '$(srcdir)/'`lda_c_wigner.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_wigner.lo `test -f 'lda_c_wigner.c' || echo '$(srcdir)/'`lda_c_wigner.c
  
+-libxc_la-lda_c_gombas.lo: lda_c_gombas.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_c_gombas.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_c_gombas.Tpo -c -o libxc_la-lda_c_gombas.lo `test -f 'lda_c_gombas.c' || echo '$(srcdir)/'`lda_c_gombas.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_c_gombas.Tpo $(DEPDIR)/libxc_la-lda_c_gombas.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_c_gombas.c' object='libxc_la-lda_c_gombas.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-lda_c_gombas.lo: lda_c_gombas.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-lda_c_gombas.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-lda_c_gombas.Tpo -c -o libdft_xc_la-lda_c_gombas.lo `test -f 'lda_c_gombas.c' || echo '$(srcdir)/'`lda_c_gombas.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-lda_c_gombas.Tpo $(DEPDIR)/libdft_xc_la-lda_c_gombas.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_c_gombas.c' object='libdft_xc_la-lda_c_gombas.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_gombas.lo `test -f 'lda_c_gombas.c' || echo '$(srcdir)/'`lda_c_gombas.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_gombas.lo `test -f 'lda_c_gombas.c' || echo '$(srcdir)/'`lda_c_gombas.c
+ 
 -libxc_la-lda_c_rpa.lo: lda_c_rpa.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_c_rpa.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_c_rpa.Tpo -c -o libxc_la-lda_c_rpa.lo `test -f 'lda_c_rpa.c' || echo '$(srcdir)/'`lda_c_rpa.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_c_rpa.Tpo $(DEPDIR)/libxc_la-lda_c_rpa.Plo
@@ -2084,6 +921,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_2d_prm.lo `test -f 'lda_c_2d_prm.c' || echo '$(srcdir)/'`lda_c_2d_prm.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_2d_prm.lo `test -f 'lda_c_2d_prm.c' || echo '$(srcdir)/'`lda_c_2d_prm.c
  
+-libxc_la-lda_k_tf.lo: lda_k_tf.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_k_tf.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_k_tf.Tpo -c -o libxc_la-lda_k_tf.lo `test -f 'lda_k_tf.c' || echo '$(srcdir)/'`lda_k_tf.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_k_tf.Tpo $(DEPDIR)/libxc_la-lda_k_tf.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_k_tf.c' object='libxc_la-lda_k_tf.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-lda_k_tf.lo: lda_k_tf.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-lda_k_tf.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-lda_k_tf.Tpo -c -o libdft_xc_la-lda_k_tf.lo `test -f 'lda_k_tf.c' || echo '$(srcdir)/'`lda_k_tf.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-lda_k_tf.Tpo $(DEPDIR)/libdft_xc_la-lda_k_tf.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_k_tf.c' object='libdft_xc_la-lda_k_tf.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_k_tf.lo `test -f 'lda_k_tf.c' || echo '$(srcdir)/'`lda_k_tf.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_k_tf.lo `test -f 'lda_k_tf.c' || echo '$(srcdir)/'`lda_k_tf.c
+ 
 -libxc_la-gga.lo: gga.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga.Tpo -c -o libxc_la-gga.lo `test -f 'gga.c' || echo '$(srcdir)/'`gga.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga.Tpo $(DEPDIR)/libxc_la-gga.Plo
@@ -2156,6 +1005,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_mpbe.lo `test -f 'gga_x_mpbe.c' || echo '$(srcdir)/'`gga_x_mpbe.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_mpbe.lo `test -f 'gga_x_mpbe.c' || echo '$(srcdir)/'`gga_x_mpbe.c
  
+-libxc_la-gga_x_herman.lo: gga_x_herman.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_herman.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_herman.Tpo -c -o libxc_la-gga_x_herman.lo `test -f 'gga_x_herman.c' || echo '$(srcdir)/'`gga_x_herman.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_herman.Tpo $(DEPDIR)/libxc_la-gga_x_herman.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_herman.c' object='libxc_la-gga_x_herman.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_herman.lo: gga_x_herman.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_herman.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_herman.Tpo -c -o libdft_xc_la-gga_x_herman.lo `test -f 'gga_x_herman.c' || echo '$(srcdir)/'`gga_x_herman.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_herman.Tpo $(DEPDIR)/libdft_xc_la-gga_x_herman.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_herman.c' object='libdft_xc_la-gga_x_herman.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_herman.lo `test -f 'gga_x_herman.c' || echo '$(srcdir)/'`gga_x_herman.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_herman.lo `test -f 'gga_x_herman.c' || echo '$(srcdir)/'`gga_x_herman.c
+ 
 -libxc_la-gga_x_b86.lo: gga_x_b86.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_b86.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_b86.Tpo -c -o libxc_la-gga_x_b86.lo `test -f 'gga_x_b86.c' || echo '$(srcdir)/'`gga_x_b86.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_b86.Tpo $(DEPDIR)/libxc_la-gga_x_b86.Plo
@@ -2300,6 +1161,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_bayesian.lo `test -f 'gga_x_bayesian.c' || echo '$(srcdir)/'`gga_x_bayesian.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_bayesian.lo `test -f 'gga_x_bayesian.c' || echo '$(srcdir)/'`gga_x_bayesian.c
  
+-libxc_la-gga_x_kt.lo: gga_x_kt.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_kt.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_kt.Tpo -c -o libxc_la-gga_x_kt.lo `test -f 'gga_x_kt.c' || echo '$(srcdir)/'`gga_x_kt.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_kt.Tpo $(DEPDIR)/libxc_la-gga_x_kt.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_kt.c' object='libxc_la-gga_x_kt.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_kt.lo: gga_x_kt.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_kt.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_kt.Tpo -c -o libdft_xc_la-gga_x_kt.lo `test -f 'gga_x_kt.c' || echo '$(srcdir)/'`gga_x_kt.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_kt.Tpo $(DEPDIR)/libdft_xc_la-gga_x_kt.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_kt.c' object='libdft_xc_la-gga_x_kt.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_kt.lo `test -f 'gga_x_kt.c' || echo '$(srcdir)/'`gga_x_kt.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_kt.lo `test -f 'gga_x_kt.c' || echo '$(srcdir)/'`gga_x_kt.c
+ 
 -libxc_la-gga_perdew.lo: gga_perdew.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_perdew.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_perdew.Tpo -c -o libxc_la-gga_perdew.lo `test -f 'gga_perdew.c' || echo '$(srcdir)/'`gga_perdew.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_perdew.Tpo $(DEPDIR)/libxc_la-gga_perdew.Plo
@@ -2384,17 +1257,41 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_lm.lo `test -f 'gga_c_lm.c' || echo '$(srcdir)/'`gga_c_lm.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_lm.lo `test -f 'gga_c_lm.c' || echo '$(srcdir)/'`gga_c_lm.c
  
--libxc_la-gga_xc_lb.lo: gga_xc_lb.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_xc_lb.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_xc_lb.Tpo -c -o libxc_la-gga_xc_lb.lo `test -f 'gga_xc_lb.c' || echo '$(srcdir)/'`gga_xc_lb.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_xc_lb.Tpo $(DEPDIR)/libxc_la-gga_xc_lb.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_xc_lb.c' object='libxc_la-gga_xc_lb.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-gga_xc_lb.lo: gga_xc_lb.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_xc_lb.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_xc_lb.Tpo -c -o libdft_xc_la-gga_xc_lb.lo `test -f 'gga_xc_lb.c' || echo '$(srcdir)/'`gga_xc_lb.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_xc_lb.Tpo $(DEPDIR)/libdft_xc_la-gga_xc_lb.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_xc_lb.c' object='libdft_xc_la-gga_xc_lb.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_xc_lb.lo `test -f 'gga_xc_lb.c' || echo '$(srcdir)/'`gga_xc_lb.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_xc_lb.lo `test -f 'gga_xc_lb.c' || echo '$(srcdir)/'`gga_xc_lb.c
+-libxc_la-gga_c_wl.lo: gga_c_wl.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_c_wl.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_c_wl.Tpo -c -o libxc_la-gga_c_wl.lo `test -f 'gga_c_wl.c' || echo '$(srcdir)/'`gga_c_wl.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_c_wl.Tpo $(DEPDIR)/libxc_la-gga_c_wl.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wl.c' object='libxc_la-gga_c_wl.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_c_wl.lo: gga_c_wl.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_c_wl.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_c_wl.Tpo -c -o libdft_xc_la-gga_c_wl.lo `test -f 'gga_c_wl.c' || echo '$(srcdir)/'`gga_c_wl.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_c_wl.Tpo $(DEPDIR)/libdft_xc_la-gga_c_wl.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wl.c' object='libdft_xc_la-gga_c_wl.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_wl.lo `test -f 'gga_c_wl.c' || echo '$(srcdir)/'`gga_c_wl.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_wl.lo `test -f 'gga_c_wl.c' || echo '$(srcdir)/'`gga_c_wl.c
+ 
+-libxc_la-gga_c_wi.lo: gga_c_wi.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_c_wi.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_c_wi.Tpo -c -o libxc_la-gga_c_wi.lo `test -f 'gga_c_wi.c' || echo '$(srcdir)/'`gga_c_wi.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_c_wi.Tpo $(DEPDIR)/libxc_la-gga_c_wi.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wi.c' object='libxc_la-gga_c_wi.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_c_wi.lo: gga_c_wi.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_c_wi.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_c_wi.Tpo -c -o libdft_xc_la-gga_c_wi.lo `test -f 'gga_c_wi.c' || echo '$(srcdir)/'`gga_c_wi.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_c_wi.Tpo $(DEPDIR)/libdft_xc_la-gga_c_wi.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wi.c' object='libdft_xc_la-gga_c_wi.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_wi.lo `test -f 'gga_c_wi.c' || echo '$(srcdir)/'`gga_c_wi.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_wi.lo `test -f 'gga_c_wi.c' || echo '$(srcdir)/'`gga_c_wi.c
+ 
+-libxc_la-gga_x_lb.lo: gga_x_lb.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_lb.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_lb.Tpo -c -o libxc_la-gga_x_lb.lo `test -f 'gga_x_lb.c' || echo '$(srcdir)/'`gga_x_lb.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_lb.Tpo $(DEPDIR)/libxc_la-gga_x_lb.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_lb.c' object='libxc_la-gga_x_lb.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_lb.lo: gga_x_lb.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_lb.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_lb.Tpo -c -o libdft_xc_la-gga_x_lb.lo `test -f 'gga_x_lb.c' || echo '$(srcdir)/'`gga_x_lb.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_lb.Tpo $(DEPDIR)/libdft_xc_la-gga_x_lb.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_lb.c' object='libdft_xc_la-gga_x_lb.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_lb.lo `test -f 'gga_x_lb.c' || echo '$(srcdir)/'`gga_x_lb.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_lb.lo `test -f 'gga_x_lb.c' || echo '$(srcdir)/'`gga_x_lb.c
  
 -libxc_la-gga_xc_b97.lo: gga_xc_b97.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_xc_b97.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_xc_b97.Tpo -c -o libxc_la-gga_xc_b97.lo `test -f 'gga_xc_b97.c' || echo '$(srcdir)/'`gga_xc_b97.c
@@ -2480,6 +1377,66 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_2d_pbe.lo `test -f 'gga_x_2d_pbe.c' || echo '$(srcdir)/'`gga_x_2d_pbe.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_2d_pbe.lo `test -f 'gga_x_2d_pbe.c' || echo '$(srcdir)/'`gga_x_2d_pbe.c
  
+-libxc_la-gga_k_tflw.lo: gga_k_tflw.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_tflw.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_tflw.Tpo -c -o libxc_la-gga_k_tflw.lo `test -f 'gga_k_tflw.c' || echo '$(srcdir)/'`gga_k_tflw.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_tflw.Tpo $(DEPDIR)/libxc_la-gga_k_tflw.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_tflw.c' object='libxc_la-gga_k_tflw.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_tflw.lo: gga_k_tflw.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_tflw.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_tflw.Tpo -c -o libdft_xc_la-gga_k_tflw.lo `test -f 'gga_k_tflw.c' || echo '$(srcdir)/'`gga_k_tflw.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_tflw.Tpo $(DEPDIR)/libdft_xc_la-gga_k_tflw.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_tflw.c' object='libdft_xc_la-gga_k_tflw.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_tflw.lo `test -f 'gga_k_tflw.c' || echo '$(srcdir)/'`gga_k_tflw.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_tflw.lo `test -f 'gga_k_tflw.c' || echo '$(srcdir)/'`gga_k_tflw.c
+ 
+-libxc_la-gga_k_pearson.lo: gga_k_pearson.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_pearson.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_pearson.Tpo -c -o libxc_la-gga_k_pearson.lo `test -f 'gga_k_pearson.c' || echo '$(srcdir)/'`gga_k_pearson.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_pearson.Tpo $(DEPDIR)/libxc_la-gga_k_pearson.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_pearson.c' object='libxc_la-gga_k_pearson.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_pearson.lo: gga_k_pearson.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_pearson.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_pearson.Tpo -c -o libdft_xc_la-gga_k_pearson.lo `test -f 'gga_k_pearson.c' || echo '$(srcdir)/'`gga_k_pearson.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_pearson.Tpo $(DEPDIR)/libdft_xc_la-gga_k_pearson.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_pearson.c' object='libdft_xc_la-gga_k_pearson.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_pearson.lo `test -f 'gga_k_pearson.c' || echo '$(srcdir)/'`gga_k_pearson.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_pearson.lo `test -f 'gga_k_pearson.c' || echo '$(srcdir)/'`gga_k_pearson.c
+ 
+-libxc_la-gga_k_ol1.lo: gga_k_ol1.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_ol1.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_ol1.Tpo -c -o libxc_la-gga_k_ol1.lo `test -f 'gga_k_ol1.c' || echo '$(srcdir)/'`gga_k_ol1.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_ol1.Tpo $(DEPDIR)/libxc_la-gga_k_ol1.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol1.c' object='libxc_la-gga_k_ol1.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_ol1.lo: gga_k_ol1.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_ol1.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_ol1.Tpo -c -o libdft_xc_la-gga_k_ol1.lo `test -f 'gga_k_ol1.c' || echo '$(srcdir)/'`gga_k_ol1.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_ol1.Tpo $(DEPDIR)/libdft_xc_la-gga_k_ol1.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol1.c' object='libdft_xc_la-gga_k_ol1.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_ol1.lo `test -f 'gga_k_ol1.c' || echo '$(srcdir)/'`gga_k_ol1.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_ol1.lo `test -f 'gga_k_ol1.c' || echo '$(srcdir)/'`gga_k_ol1.c
+ 
+-libxc_la-gga_k_ol2.lo: gga_k_ol2.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_ol2.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_ol2.Tpo -c -o libxc_la-gga_k_ol2.lo `test -f 'gga_k_ol2.c' || echo '$(srcdir)/'`gga_k_ol2.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_ol2.Tpo $(DEPDIR)/libxc_la-gga_k_ol2.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol2.c' object='libxc_la-gga_k_ol2.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_ol2.lo: gga_k_ol2.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_ol2.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_ol2.Tpo -c -o libdft_xc_la-gga_k_ol2.lo `test -f 'gga_k_ol2.c' || echo '$(srcdir)/'`gga_k_ol2.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_ol2.Tpo $(DEPDIR)/libdft_xc_la-gga_k_ol2.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol2.c' object='libdft_xc_la-gga_k_ol2.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_ol2.lo `test -f 'gga_k_ol2.c' || echo '$(srcdir)/'`gga_k_ol2.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_ol2.lo `test -f 'gga_k_ol2.c' || echo '$(srcdir)/'`gga_k_ol2.c
+ 
+-libxc_la-gga_k_dk.lo: gga_k_dk.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_dk.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_dk.Tpo -c -o libxc_la-gga_k_dk.lo `test -f 'gga_k_dk.c' || echo '$(srcdir)/'`gga_k_dk.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_dk.Tpo $(DEPDIR)/libxc_la-gga_k_dk.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_dk.c' object='libxc_la-gga_k_dk.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_dk.lo: gga_k_dk.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_dk.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_dk.Tpo -c -o libdft_xc_la-gga_k_dk.lo `test -f 'gga_k_dk.c' || echo '$(srcdir)/'`gga_k_dk.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_dk.Tpo $(DEPDIR)/libdft_xc_la-gga_k_dk.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_dk.c' object='libdft_xc_la-gga_k_dk.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_dk.lo `test -f 'gga_k_dk.c' || echo '$(srcdir)/'`gga_k_dk.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_dk.lo `test -f 'gga_k_dk.c' || echo '$(srcdir)/'`gga_k_dk.c
+ 
 -libxc_la-hyb_gga_xc_b3lyp.lo: hyb_gga_xc_b3lyp.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-hyb_gga_xc_b3lyp.lo -MD -MP -MF $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp.Tpo -c -o libxc_la-hyb_gga_xc_b3lyp.lo `test -f 'hyb_gga_xc_b3lyp.c' || echo '$(srcdir)/'`hyb_gga_xc_b3lyp.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp.Tpo $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp.Plo
@@ -2636,6 +1593,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mgga_c_tpss.lo `test -f 'mgga_c_tpss.c' || echo '$(srcdir)/'`mgga_c_tpss.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mgga_c_tpss.lo `test -f 'mgga_c_tpss.c' || echo '$(srcdir)/'`mgga_c_tpss.c
  
+-libxc_la-mgga_x_2d_prhg07.lo: mgga_x_2d_prhg07.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mgga_x_2d_prhg07.lo -MD -MP -MF $(DEPDIR)/libxc_la-mgga_x_2d_prhg07.Tpo -c -o libxc_la-mgga_x_2d_prhg07.lo `test -f 'mgga_x_2d_prhg07.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mgga_x_2d_prhg07.Tpo $(DEPDIR)/libxc_la-mgga_x_2d_prhg07.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgga_x_2d_prhg07.c' object='libxc_la-mgga_x_2d_prhg07.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-mgga_x_2d_prhg07.lo: mgga_x_2d_prhg07.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mgga_x_2d_prhg07.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07.Tpo -c -o libdft_xc_la-mgga_x_2d_prhg07.lo `test -f 'mgga_x_2d_prhg07.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07.Tpo $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgga_x_2d_prhg07.c' object='libdft_xc_la-mgga_x_2d_prhg07.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mgga_x_2d_prhg07.lo `test -f 'mgga_x_2d_prhg07.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mgga_x_2d_prhg07.lo `test -f 'mgga_x_2d_prhg07.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07.c
+ 
 -libxc_la-lca.lo: lca.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lca.lo -MD -MP -MF $(DEPDIR)/libxc_la-lca.Tpo -c -o libxc_la-lca.lo `test -f 'lca.c' || echo '$(srcdir)/'`lca.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lca.Tpo $(DEPDIR)/libxc_la-lca.Plo
@@ -2672,66 +1641,6 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lca_lch.lo `test -f 'lca_lch.c' || echo '$(srcdir)/'`lca_lch.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lca_lch.lo `test -f 'lca_lch.c' || echo '$(srcdir)/'`lca_lch.c
  
--libxc_la-mix_func.lo: mix_func.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mix_func.lo -MD -MP -MF $(DEPDIR)/libxc_la-mix_func.Tpo -c -o libxc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mix_func.Tpo $(DEPDIR)/libxc_la-mix_func.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func.c' object='libxc_la-mix_func.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-mix_func.lo: mix_func.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mix_func.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mix_func.Tpo -c -o libdft_xc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mix_func.Tpo $(DEPDIR)/libdft_xc_la-mix_func.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func.c' object='libdft_xc_la-mix_func.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mix_func.lo `test -f 'mix_func.c' || echo '$(srcdir)/'`mix_func.c
- 
--libxc_la-special_functions.lo: special_functions.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-special_functions.lo -MD -MP -MF $(DEPDIR)/libxc_la-special_functions.Tpo -c -o libxc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-special_functions.Tpo $(DEPDIR)/libxc_la-special_functions.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions.c' object='libxc_la-special_functions.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-special_functions.lo: special_functions.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-special_functions.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-special_functions.Tpo -c -o libdft_xc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-special_functions.Tpo $(DEPDIR)/libdft_xc_la-special_functions.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions.c' object='libdft_xc_la-special_functions.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-special_functions.lo `test -f 'special_functions.c' || echo '$(srcdir)/'`special_functions.c
- 
--libxc_la-integrate.lo: integrate.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-integrate.lo -MD -MP -MF $(DEPDIR)/libxc_la-integrate.Tpo -c -o libxc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-integrate.Tpo $(DEPDIR)/libxc_la-integrate.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate.c' object='libxc_la-integrate.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-integrate.lo: integrate.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-integrate.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-integrate.Tpo -c -o libdft_xc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-integrate.Tpo $(DEPDIR)/libdft_xc_la-integrate.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate.c' object='libdft_xc_la-integrate.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-integrate.lo `test -f 'integrate.c' || echo '$(srcdir)/'`integrate.c
- 
--libxc_la-util.lo: util.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-util.lo -MD -MP -MF $(DEPDIR)/libxc_la-util.Tpo -c -o libxc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-util.Tpo $(DEPDIR)/libxc_la-util.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libxc_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-util.lo: util.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-util.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-util.Tpo -c -o libdft_xc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-util.Tpo $(DEPDIR)/libdft_xc_la-util.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libdft_xc_la-util.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
- 
--libxc_la-functionals.lo: functionals.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-functionals.lo -MD -MP -MF $(DEPDIR)/libxc_la-functionals.Tpo -c -o libxc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-functionals.Tpo $(DEPDIR)/libxc_la-functionals.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals.c' object='libxc_la-functionals.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-functionals.lo: functionals.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-functionals.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-functionals.Tpo -c -o libdft_xc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-functionals.Tpo $(DEPDIR)/libdft_xc_la-functionals.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals.c' object='libdft_xc_la-functionals.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-functionals.lo `test -f 'functionals.c' || echo '$(srcdir)/'`functionals.c
- 
 -libxc_la-xc_f.lo: xc_f.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-xc_f.lo -MD -MP -MF $(DEPDIR)/libxc_la-xc_f.Tpo -c -o libxc_la-xc_f.lo `test -f 'xc_f.c' || echo '$(srcdir)/'`xc_f.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-xc_f.Tpo $(DEPDIR)/libxc_la-xc_f.Plo
@@ -2744,6 +1653,66 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-xc_f.lo `test -f 'xc_f.c' || echo '$(srcdir)/'`xc_f.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-xc_f.lo `test -f 'xc_f.c' || echo '$(srcdir)/'`xc_f.c
  
+-libxc_la-special_functions_s.lo: special_functions_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-special_functions_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-special_functions_s.Tpo -c -o libxc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-special_functions_s.Tpo $(DEPDIR)/libxc_la-special_functions_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions_s.c' object='libxc_la-special_functions_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-special_functions_s.lo: special_functions_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-special_functions_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-special_functions_s.Tpo -c -o libdft_xc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-special_functions_s.Tpo $(DEPDIR)/libdft_xc_la-special_functions_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions_s.c' object='libdft_xc_la-special_functions_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
+ 
+-libxc_la-integrate_s.lo: integrate_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-integrate_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-integrate_s.Tpo -c -o libxc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-integrate_s.Tpo $(DEPDIR)/libxc_la-integrate_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate_s.c' object='libxc_la-integrate_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-integrate_s.lo: integrate_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-integrate_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-integrate_s.Tpo -c -o libdft_xc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-integrate_s.Tpo $(DEPDIR)/libdft_xc_la-integrate_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate_s.c' object='libdft_xc_la-integrate_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
+ 
+-libxc_la-util_s.lo: util_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-util_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-util_s.Tpo -c -o libxc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-util_s.Tpo $(DEPDIR)/libxc_la-util_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util_s.c' object='libxc_la-util_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-util_s.lo: util_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-util_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-util_s.Tpo -c -o libdft_xc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-util_s.Tpo $(DEPDIR)/libdft_xc_la-util_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util_s.c' object='libdft_xc_la-util_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
+ 
+-libxc_la-mix_func_s.lo: mix_func_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mix_func_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-mix_func_s.Tpo -c -o libxc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mix_func_s.Tpo $(DEPDIR)/libxc_la-mix_func_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func_s.c' object='libxc_la-mix_func_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-mix_func_s.lo: mix_func_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mix_func_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mix_func_s.Tpo -c -o libdft_xc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mix_func_s.Tpo $(DEPDIR)/libdft_xc_la-mix_func_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func_s.c' object='libdft_xc_la-mix_func_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
+ 
+-libxc_la-functionals_s.lo: functionals_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-functionals_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-functionals_s.Tpo -c -o libxc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-functionals_s.Tpo $(DEPDIR)/libxc_la-functionals_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals_s.c' object='libxc_la-functionals_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-functionals_s.lo: functionals_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-functionals_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-functionals_s.Tpo -c -o libdft_xc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-functionals_s.Tpo $(DEPDIR)/libdft_xc_la-functionals_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals_s.c' object='libdft_xc_la-functionals_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
+ 
 -libxc_la-lda_s.lo: lda_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_s.Tpo -c -o libxc_la-lda_s.lo `test -f 'lda_s.c' || echo '$(srcdir)/'`lda_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_s.Tpo $(DEPDIR)/libxc_la-lda_s.Plo
@@ -2804,6 +1773,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_wigner_s.lo `test -f 'lda_c_wigner_s.c' || echo '$(srcdir)/'`lda_c_wigner_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_wigner_s.lo `test -f 'lda_c_wigner_s.c' || echo '$(srcdir)/'`lda_c_wigner_s.c
  
+-libxc_la-lda_c_gombas_s.lo: lda_c_gombas_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_c_gombas_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_c_gombas_s.Tpo -c -o libxc_la-lda_c_gombas_s.lo `test -f 'lda_c_gombas_s.c' || echo '$(srcdir)/'`lda_c_gombas_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_c_gombas_s.Tpo $(DEPDIR)/libxc_la-lda_c_gombas_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_c_gombas_s.c' object='libxc_la-lda_c_gombas_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-lda_c_gombas_s.lo: lda_c_gombas_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-lda_c_gombas_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-lda_c_gombas_s.Tpo -c -o libdft_xc_la-lda_c_gombas_s.lo `test -f 'lda_c_gombas_s.c' || echo '$(srcdir)/'`lda_c_gombas_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-lda_c_gombas_s.Tpo $(DEPDIR)/libdft_xc_la-lda_c_gombas_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_c_gombas_s.c' object='libdft_xc_la-lda_c_gombas_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_gombas_s.lo `test -f 'lda_c_gombas_s.c' || echo '$(srcdir)/'`lda_c_gombas_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_gombas_s.lo `test -f 'lda_c_gombas_s.c' || echo '$(srcdir)/'`lda_c_gombas_s.c
+ 
 -libxc_la-lda_c_rpa_s.lo: lda_c_rpa_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_c_rpa_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_c_rpa_s.Tpo -c -o libxc_la-lda_c_rpa_s.lo `test -f 'lda_c_rpa_s.c' || echo '$(srcdir)/'`lda_c_rpa_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_c_rpa_s.Tpo $(DEPDIR)/libxc_la-lda_c_rpa_s.Plo
@@ -2924,6 +1905,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_c_2d_prm_s.lo `test -f 'lda_c_2d_prm_s.c' || echo '$(srcdir)/'`lda_c_2d_prm_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_c_2d_prm_s.lo `test -f 'lda_c_2d_prm_s.c' || echo '$(srcdir)/'`lda_c_2d_prm_s.c
  
+-libxc_la-lda_k_tf_s.lo: lda_k_tf_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lda_k_tf_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-lda_k_tf_s.Tpo -c -o libxc_la-lda_k_tf_s.lo `test -f 'lda_k_tf_s.c' || echo '$(srcdir)/'`lda_k_tf_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lda_k_tf_s.Tpo $(DEPDIR)/libxc_la-lda_k_tf_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_k_tf_s.c' object='libxc_la-lda_k_tf_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-lda_k_tf_s.lo: lda_k_tf_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-lda_k_tf_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-lda_k_tf_s.Tpo -c -o libdft_xc_la-lda_k_tf_s.lo `test -f 'lda_k_tf_s.c' || echo '$(srcdir)/'`lda_k_tf_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-lda_k_tf_s.Tpo $(DEPDIR)/libdft_xc_la-lda_k_tf_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lda_k_tf_s.c' object='libdft_xc_la-lda_k_tf_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lda_k_tf_s.lo `test -f 'lda_k_tf_s.c' || echo '$(srcdir)/'`lda_k_tf_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lda_k_tf_s.lo `test -f 'lda_k_tf_s.c' || echo '$(srcdir)/'`lda_k_tf_s.c
+ 
 -libxc_la-gga_s.lo: gga_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_s.Tpo -c -o libxc_la-gga_s.lo `test -f 'gga_s.c' || echo '$(srcdir)/'`gga_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_s.Tpo $(DEPDIR)/libxc_la-gga_s.Plo
@@ -2996,6 +1989,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_mpbe_s.lo `test -f 'gga_x_mpbe_s.c' || echo '$(srcdir)/'`gga_x_mpbe_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_mpbe_s.lo `test -f 'gga_x_mpbe_s.c' || echo '$(srcdir)/'`gga_x_mpbe_s.c
  
+-libxc_la-gga_x_herman_s.lo: gga_x_herman_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_herman_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_herman_s.Tpo -c -o libxc_la-gga_x_herman_s.lo `test -f 'gga_x_herman_s.c' || echo '$(srcdir)/'`gga_x_herman_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_herman_s.Tpo $(DEPDIR)/libxc_la-gga_x_herman_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_herman_s.c' object='libxc_la-gga_x_herman_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_herman_s.lo: gga_x_herman_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_herman_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_herman_s.Tpo -c -o libdft_xc_la-gga_x_herman_s.lo `test -f 'gga_x_herman_s.c' || echo '$(srcdir)/'`gga_x_herman_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_herman_s.Tpo $(DEPDIR)/libdft_xc_la-gga_x_herman_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_herman_s.c' object='libdft_xc_la-gga_x_herman_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_herman_s.lo `test -f 'gga_x_herman_s.c' || echo '$(srcdir)/'`gga_x_herman_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_herman_s.lo `test -f 'gga_x_herman_s.c' || echo '$(srcdir)/'`gga_x_herman_s.c
+ 
 -libxc_la-gga_x_b86_s.lo: gga_x_b86_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_b86_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_b86_s.Tpo -c -o libxc_la-gga_x_b86_s.lo `test -f 'gga_x_b86_s.c' || echo '$(srcdir)/'`gga_x_b86_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_b86_s.Tpo $(DEPDIR)/libxc_la-gga_x_b86_s.Plo
@@ -3140,6 +2145,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_bayesian_s.lo `test -f 'gga_x_bayesian_s.c' || echo '$(srcdir)/'`gga_x_bayesian_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_bayesian_s.lo `test -f 'gga_x_bayesian_s.c' || echo '$(srcdir)/'`gga_x_bayesian_s.c
  
+-libxc_la-gga_x_kt_s.lo: gga_x_kt_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_kt_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_kt_s.Tpo -c -o libxc_la-gga_x_kt_s.lo `test -f 'gga_x_kt_s.c' || echo '$(srcdir)/'`gga_x_kt_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_kt_s.Tpo $(DEPDIR)/libxc_la-gga_x_kt_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_kt_s.c' object='libxc_la-gga_x_kt_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_kt_s.lo: gga_x_kt_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_kt_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_kt_s.Tpo -c -o libdft_xc_la-gga_x_kt_s.lo `test -f 'gga_x_kt_s.c' || echo '$(srcdir)/'`gga_x_kt_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_kt_s.Tpo $(DEPDIR)/libdft_xc_la-gga_x_kt_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_kt_s.c' object='libdft_xc_la-gga_x_kt_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_kt_s.lo `test -f 'gga_x_kt_s.c' || echo '$(srcdir)/'`gga_x_kt_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_kt_s.lo `test -f 'gga_x_kt_s.c' || echo '$(srcdir)/'`gga_x_kt_s.c
+ 
 -libxc_la-gga_perdew_s.lo: gga_perdew_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_perdew_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_perdew_s.Tpo -c -o libxc_la-gga_perdew_s.lo `test -f 'gga_perdew_s.c' || echo '$(srcdir)/'`gga_perdew_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_perdew_s.Tpo $(DEPDIR)/libxc_la-gga_perdew_s.Plo
@@ -3224,17 +2241,41 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_lm_s.lo `test -f 'gga_c_lm_s.c' || echo '$(srcdir)/'`gga_c_lm_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_lm_s.lo `test -f 'gga_c_lm_s.c' || echo '$(srcdir)/'`gga_c_lm_s.c
  
--libxc_la-gga_xc_lb_s.lo: gga_xc_lb_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_xc_lb_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_xc_lb_s.Tpo -c -o libxc_la-gga_xc_lb_s.lo `test -f 'gga_xc_lb_s.c' || echo '$(srcdir)/'`gga_xc_lb_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_xc_lb_s.Tpo $(DEPDIR)/libxc_la-gga_xc_lb_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_xc_lb_s.c' object='libxc_la-gga_xc_lb_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-gga_xc_lb_s.lo: gga_xc_lb_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_xc_lb_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_xc_lb_s.Tpo -c -o libdft_xc_la-gga_xc_lb_s.lo `test -f 'gga_xc_lb_s.c' || echo '$(srcdir)/'`gga_xc_lb_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_xc_lb_s.Tpo $(DEPDIR)/libdft_xc_la-gga_xc_lb_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_xc_lb_s.c' object='libdft_xc_la-gga_xc_lb_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_xc_lb_s.lo `test -f 'gga_xc_lb_s.c' || echo '$(srcdir)/'`gga_xc_lb_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_xc_lb_s.lo `test -f 'gga_xc_lb_s.c' || echo '$(srcdir)/'`gga_xc_lb_s.c
+-libxc_la-gga_c_wl_s.lo: gga_c_wl_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_c_wl_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_c_wl_s.Tpo -c -o libxc_la-gga_c_wl_s.lo `test -f 'gga_c_wl_s.c' || echo '$(srcdir)/'`gga_c_wl_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_c_wl_s.Tpo $(DEPDIR)/libxc_la-gga_c_wl_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wl_s.c' object='libxc_la-gga_c_wl_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_c_wl_s.lo: gga_c_wl_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_c_wl_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_c_wl_s.Tpo -c -o libdft_xc_la-gga_c_wl_s.lo `test -f 'gga_c_wl_s.c' || echo '$(srcdir)/'`gga_c_wl_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_c_wl_s.Tpo $(DEPDIR)/libdft_xc_la-gga_c_wl_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wl_s.c' object='libdft_xc_la-gga_c_wl_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_wl_s.lo `test -f 'gga_c_wl_s.c' || echo '$(srcdir)/'`gga_c_wl_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_wl_s.lo `test -f 'gga_c_wl_s.c' || echo '$(srcdir)/'`gga_c_wl_s.c
+ 
+-libxc_la-gga_c_wi_s.lo: gga_c_wi_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_c_wi_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_c_wi_s.Tpo -c -o libxc_la-gga_c_wi_s.lo `test -f 'gga_c_wi_s.c' || echo '$(srcdir)/'`gga_c_wi_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_c_wi_s.Tpo $(DEPDIR)/libxc_la-gga_c_wi_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wi_s.c' object='libxc_la-gga_c_wi_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_c_wi_s.lo: gga_c_wi_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_c_wi_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_c_wi_s.Tpo -c -o libdft_xc_la-gga_c_wi_s.lo `test -f 'gga_c_wi_s.c' || echo '$(srcdir)/'`gga_c_wi_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_c_wi_s.Tpo $(DEPDIR)/libdft_xc_la-gga_c_wi_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_c_wi_s.c' object='libdft_xc_la-gga_c_wi_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_c_wi_s.lo `test -f 'gga_c_wi_s.c' || echo '$(srcdir)/'`gga_c_wi_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_c_wi_s.lo `test -f 'gga_c_wi_s.c' || echo '$(srcdir)/'`gga_c_wi_s.c
+ 
+-libxc_la-gga_x_lb_s.lo: gga_x_lb_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_x_lb_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_x_lb_s.Tpo -c -o libxc_la-gga_x_lb_s.lo `test -f 'gga_x_lb_s.c' || echo '$(srcdir)/'`gga_x_lb_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_x_lb_s.Tpo $(DEPDIR)/libxc_la-gga_x_lb_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_lb_s.c' object='libxc_la-gga_x_lb_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_x_lb_s.lo: gga_x_lb_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_x_lb_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_x_lb_s.Tpo -c -o libdft_xc_la-gga_x_lb_s.lo `test -f 'gga_x_lb_s.c' || echo '$(srcdir)/'`gga_x_lb_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_x_lb_s.Tpo $(DEPDIR)/libdft_xc_la-gga_x_lb_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_x_lb_s.c' object='libdft_xc_la-gga_x_lb_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_lb_s.lo `test -f 'gga_x_lb_s.c' || echo '$(srcdir)/'`gga_x_lb_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_lb_s.lo `test -f 'gga_x_lb_s.c' || echo '$(srcdir)/'`gga_x_lb_s.c
  
 -libxc_la-gga_xc_b97_s.lo: gga_xc_b97_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_xc_b97_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_xc_b97_s.Tpo -c -o libxc_la-gga_xc_b97_s.lo `test -f 'gga_xc_b97_s.c' || echo '$(srcdir)/'`gga_xc_b97_s.c
@@ -3320,6 +2361,66 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_x_2d_pbe_s.lo `test -f 'gga_x_2d_pbe_s.c' || echo '$(srcdir)/'`gga_x_2d_pbe_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_x_2d_pbe_s.lo `test -f 'gga_x_2d_pbe_s.c' || echo '$(srcdir)/'`gga_x_2d_pbe_s.c
  
+-libxc_la-gga_k_tflw_s.lo: gga_k_tflw_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_tflw_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_tflw_s.Tpo -c -o libxc_la-gga_k_tflw_s.lo `test -f 'gga_k_tflw_s.c' || echo '$(srcdir)/'`gga_k_tflw_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_tflw_s.Tpo $(DEPDIR)/libxc_la-gga_k_tflw_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_tflw_s.c' object='libxc_la-gga_k_tflw_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_tflw_s.lo: gga_k_tflw_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_tflw_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_tflw_s.Tpo -c -o libdft_xc_la-gga_k_tflw_s.lo `test -f 'gga_k_tflw_s.c' || echo '$(srcdir)/'`gga_k_tflw_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_tflw_s.Tpo $(DEPDIR)/libdft_xc_la-gga_k_tflw_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_tflw_s.c' object='libdft_xc_la-gga_k_tflw_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_tflw_s.lo `test -f 'gga_k_tflw_s.c' || echo '$(srcdir)/'`gga_k_tflw_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_tflw_s.lo `test -f 'gga_k_tflw_s.c' || echo '$(srcdir)/'`gga_k_tflw_s.c
+ 
+-libxc_la-gga_k_pearson_s.lo: gga_k_pearson_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_pearson_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_pearson_s.Tpo -c -o libxc_la-gga_k_pearson_s.lo `test -f 'gga_k_pearson_s.c' || echo '$(srcdir)/'`gga_k_pearson_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_pearson_s.Tpo $(DEPDIR)/libxc_la-gga_k_pearson_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_pearson_s.c' object='libxc_la-gga_k_pearson_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_pearson_s.lo: gga_k_pearson_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_pearson_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_pearson_s.Tpo -c -o libdft_xc_la-gga_k_pearson_s.lo `test -f 'gga_k_pearson_s.c' || echo '$(srcdir)/'`gga_k_pearson_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_pearson_s.Tpo $(DEPDIR)/libdft_xc_la-gga_k_pearson_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_pearson_s.c' object='libdft_xc_la-gga_k_pearson_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_pearson_s.lo `test -f 'gga_k_pearson_s.c' || echo '$(srcdir)/'`gga_k_pearson_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_pearson_s.lo `test -f 'gga_k_pearson_s.c' || echo '$(srcdir)/'`gga_k_pearson_s.c
+ 
+-libxc_la-gga_k_ol1_s.lo: gga_k_ol1_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_ol1_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_ol1_s.Tpo -c -o libxc_la-gga_k_ol1_s.lo `test -f 'gga_k_ol1_s.c' || echo '$(srcdir)/'`gga_k_ol1_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_ol1_s.Tpo $(DEPDIR)/libxc_la-gga_k_ol1_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol1_s.c' object='libxc_la-gga_k_ol1_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_ol1_s.lo: gga_k_ol1_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_ol1_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_ol1_s.Tpo -c -o libdft_xc_la-gga_k_ol1_s.lo `test -f 'gga_k_ol1_s.c' || echo '$(srcdir)/'`gga_k_ol1_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_ol1_s.Tpo $(DEPDIR)/libdft_xc_la-gga_k_ol1_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol1_s.c' object='libdft_xc_la-gga_k_ol1_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_ol1_s.lo `test -f 'gga_k_ol1_s.c' || echo '$(srcdir)/'`gga_k_ol1_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_ol1_s.lo `test -f 'gga_k_ol1_s.c' || echo '$(srcdir)/'`gga_k_ol1_s.c
+ 
+-libxc_la-gga_k_ol2_s.lo: gga_k_ol2_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_ol2_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_ol2_s.Tpo -c -o libxc_la-gga_k_ol2_s.lo `test -f 'gga_k_ol2_s.c' || echo '$(srcdir)/'`gga_k_ol2_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_ol2_s.Tpo $(DEPDIR)/libxc_la-gga_k_ol2_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol2_s.c' object='libxc_la-gga_k_ol2_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_ol2_s.lo: gga_k_ol2_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_ol2_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_ol2_s.Tpo -c -o libdft_xc_la-gga_k_ol2_s.lo `test -f 'gga_k_ol2_s.c' || echo '$(srcdir)/'`gga_k_ol2_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_ol2_s.Tpo $(DEPDIR)/libdft_xc_la-gga_k_ol2_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_ol2_s.c' object='libdft_xc_la-gga_k_ol2_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_ol2_s.lo `test -f 'gga_k_ol2_s.c' || echo '$(srcdir)/'`gga_k_ol2_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_ol2_s.lo `test -f 'gga_k_ol2_s.c' || echo '$(srcdir)/'`gga_k_ol2_s.c
+ 
+-libxc_la-gga_k_dk_s.lo: gga_k_dk_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-gga_k_dk_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-gga_k_dk_s.Tpo -c -o libxc_la-gga_k_dk_s.lo `test -f 'gga_k_dk_s.c' || echo '$(srcdir)/'`gga_k_dk_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-gga_k_dk_s.Tpo $(DEPDIR)/libxc_la-gga_k_dk_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_dk_s.c' object='libxc_la-gga_k_dk_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-gga_k_dk_s.lo: gga_k_dk_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-gga_k_dk_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-gga_k_dk_s.Tpo -c -o libdft_xc_la-gga_k_dk_s.lo `test -f 'gga_k_dk_s.c' || echo '$(srcdir)/'`gga_k_dk_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-gga_k_dk_s.Tpo $(DEPDIR)/libdft_xc_la-gga_k_dk_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gga_k_dk_s.c' object='libdft_xc_la-gga_k_dk_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-gga_k_dk_s.lo `test -f 'gga_k_dk_s.c' || echo '$(srcdir)/'`gga_k_dk_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-gga_k_dk_s.lo `test -f 'gga_k_dk_s.c' || echo '$(srcdir)/'`gga_k_dk_s.c
+ 
 -libxc_la-hyb_gga_xc_b3lyp_s.lo: hyb_gga_xc_b3lyp_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-hyb_gga_xc_b3lyp_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp_s.Tpo -c -o libxc_la-hyb_gga_xc_b3lyp_s.lo `test -f 'hyb_gga_xc_b3lyp_s.c' || echo '$(srcdir)/'`hyb_gga_xc_b3lyp_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp_s.Tpo $(DEPDIR)/libxc_la-hyb_gga_xc_b3lyp_s.Plo
@@ -3476,6 +2577,18 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mgga_c_tpss_s.lo `test -f 'mgga_c_tpss_s.c' || echo '$(srcdir)/'`mgga_c_tpss_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mgga_c_tpss_s.lo `test -f 'mgga_c_tpss_s.c' || echo '$(srcdir)/'`mgga_c_tpss_s.c
  
+-libxc_la-mgga_x_2d_prhg07_s.lo: mgga_x_2d_prhg07_s.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mgga_x_2d_prhg07_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-mgga_x_2d_prhg07_s.Tpo -c -o libxc_la-mgga_x_2d_prhg07_s.lo `test -f 'mgga_x_2d_prhg07_s.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07_s.c
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mgga_x_2d_prhg07_s.Tpo $(DEPDIR)/libxc_la-mgga_x_2d_prhg07_s.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgga_x_2d_prhg07_s.c' object='libxc_la-mgga_x_2d_prhg07_s.lo' libtool=yes @AMDEPBACKSLASH@
++libdft_xc_la-mgga_x_2d_prhg07_s.lo: mgga_x_2d_prhg07_s.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mgga_x_2d_prhg07_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07_s.Tpo -c -o libdft_xc_la-mgga_x_2d_prhg07_s.lo `test -f 'mgga_x_2d_prhg07_s.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07_s.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07_s.Tpo $(DEPDIR)/libdft_xc_la-mgga_x_2d_prhg07_s.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgga_x_2d_prhg07_s.c' object='libdft_xc_la-mgga_x_2d_prhg07_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mgga_x_2d_prhg07_s.lo `test -f 'mgga_x_2d_prhg07_s.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07_s.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mgga_x_2d_prhg07_s.lo `test -f 'mgga_x_2d_prhg07_s.c' || echo '$(srcdir)/'`mgga_x_2d_prhg07_s.c
+ 
 -libxc_la-lca_s.lo: lca_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-lca_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-lca_s.Tpo -c -o libxc_la-lca_s.lo `test -f 'lca_s.c' || echo '$(srcdir)/'`lca_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-lca_s.Tpo $(DEPDIR)/libxc_la-lca_s.Plo
@@ -3512,66 +2625,6 @@
 - at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-lca_lch_s.lo `test -f 'lca_lch_s.c' || echo '$(srcdir)/'`lca_lch_s.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-lca_lch_s.lo `test -f 'lca_lch_s.c' || echo '$(srcdir)/'`lca_lch_s.c
  
--libxc_la-mix_func_s.lo: mix_func_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-mix_func_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-mix_func_s.Tpo -c -o libxc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-mix_func_s.Tpo $(DEPDIR)/libxc_la-mix_func_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func_s.c' object='libxc_la-mix_func_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-mix_func_s.lo: mix_func_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-mix_func_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-mix_func_s.Tpo -c -o libdft_xc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-mix_func_s.Tpo $(DEPDIR)/libdft_xc_la-mix_func_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mix_func_s.c' object='libdft_xc_la-mix_func_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-mix_func_s.lo `test -f 'mix_func_s.c' || echo '$(srcdir)/'`mix_func_s.c
- 
--libxc_la-special_functions_s.lo: special_functions_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-special_functions_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-special_functions_s.Tpo -c -o libxc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-special_functions_s.Tpo $(DEPDIR)/libxc_la-special_functions_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions_s.c' object='libxc_la-special_functions_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-special_functions_s.lo: special_functions_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-special_functions_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-special_functions_s.Tpo -c -o libdft_xc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-special_functions_s.Tpo $(DEPDIR)/libdft_xc_la-special_functions_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='special_functions_s.c' object='libdft_xc_la-special_functions_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-special_functions_s.lo `test -f 'special_functions_s.c' || echo '$(srcdir)/'`special_functions_s.c
- 
--libxc_la-integrate_s.lo: integrate_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-integrate_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-integrate_s.Tpo -c -o libxc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-integrate_s.Tpo $(DEPDIR)/libxc_la-integrate_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate_s.c' object='libxc_la-integrate_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-integrate_s.lo: integrate_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-integrate_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-integrate_s.Tpo -c -o libdft_xc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-integrate_s.Tpo $(DEPDIR)/libdft_xc_la-integrate_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='integrate_s.c' object='libdft_xc_la-integrate_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-integrate_s.lo `test -f 'integrate_s.c' || echo '$(srcdir)/'`integrate_s.c
- 
--libxc_la-util_s.lo: util_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-util_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-util_s.Tpo -c -o libxc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-util_s.Tpo $(DEPDIR)/libxc_la-util_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util_s.c' object='libxc_la-util_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-util_s.lo: util_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-util_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-util_s.Tpo -c -o libdft_xc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-util_s.Tpo $(DEPDIR)/libdft_xc_la-util_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util_s.c' object='libdft_xc_la-util_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-util_s.lo `test -f 'util_s.c' || echo '$(srcdir)/'`util_s.c
- 
--libxc_la-functionals_s.lo: functionals_s.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-functionals_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-functionals_s.Tpo -c -o libxc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-functionals_s.Tpo $(DEPDIR)/libxc_la-functionals_s.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals_s.c' object='libxc_la-functionals_s.lo' libtool=yes @AMDEPBACKSLASH@
-+libdft_xc_la-functionals_s.lo: functionals_s.c
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdft_xc_la-functionals_s.lo -MD -MP -MF $(DEPDIR)/libdft_xc_la-functionals_s.Tpo -c -o libdft_xc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdft_xc_la-functionals_s.Tpo $(DEPDIR)/libdft_xc_la-functionals_s.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functionals_s.c' object='libdft_xc_la-functionals_s.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(libdft_xc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdft_xc_la-functionals_s.lo `test -f 'functionals_s.c' || echo '$(srcdir)/'`functionals_s.c
- 
 -libxc_la-xc_f_s.lo: xc_f_s.c
 - at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(libxc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxc_la-xc_f_s.lo -MD -MP -MF $(DEPDIR)/libxc_la-xc_f_s.Tpo -c -o libxc_la-xc_f_s.lo `test -f 'xc_f_s.c' || echo '$(srcdir)/'`xc_f_s.c
 - at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxc_la-xc_f_s.Tpo $(DEPDIR)/libxc_la-xc_f_s.Plo
@@ -3586,7 +2639,7 @@
  
  .f90.o:
  	$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
-@@ -1608,14 +1615,14 @@ libxc_la-xc_f_s.lo: xc_f_s.c
+@@ -1819,14 +1828,14 @@ libxc_la-xc_f_s.lo: xc_f_s.c
  .f90.lo:
  	$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
  
@@ -3607,9 +2660,25 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
---- libxc-1.0.orig/testsuite/Makefile.in
-+++ libxc-1.0/testsuite/Makefile.in
-@@ -204,10 +204,10 @@ top_srcdir = @top_srcdir@
+--- libxc-1.1.0.orig/testsuite/Makefile.am
++++ libxc-1.1.0/testsuite/Makefile.am
+@@ -24,11 +24,11 @@ dist_noinst_SCRIPTS = xc-run_testsuite x
+ #TESTS = xc-run_testsuite
+ 
+ xc_get_data_SOURCES = xc-get_data.c
+-xc_get_data_LDADD = -L../src/ -lxc -lm
++xc_get_data_LDADD = -L../src/ -ldft_xc -lm
+ xc_get_data_CPPFLAGS = -I$(srcdir)/../src/ -I$(top_builddir)/src
+ 
+ xc_consistency_SOURCES = xc-consistency.c
+-xc_consistency_LDADD = -L../src/ -lxc -lm
++xc_consistency_LDADD = -L../src/ -ldft_xc -lm
+ xc_consistency_CPPFLAGS = -I$(srcdir)/../src/ -I$(top_builddir)/src
+ 
+ dist_noinst_DATA =         \
+--- libxc-1.1.0.orig/testsuite/Makefile.in
++++ libxc-1.1.0/testsuite/Makefile.in
+@@ -206,10 +206,10 @@ top_srcdir = @top_srcdir@
  dist_noinst_SCRIPTS = xc-run_testsuite xc-reference.pl
  #TESTS = xc-run_testsuite
  xc_get_data_SOURCES = xc-get_data.c

Modified: packages/libxc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libxc/trunk/debian/rules?rev=38617&op=diff
==============================================================================
--- packages/libxc/trunk/debian/rules (original)
+++ packages/libxc/trunk/debian/rules Fri Jul  1 10:44:51 2011
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_USER_FLAGS := --enable-fortran
+DEB_CONFIGURE_USER_FLAGS := --enable-shared
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(DEB_DESTDIR)
 DEB_INSTALL_DOCS_libdftxc0 :=
 DEB_INSTALL_DOCS_libdftxc0-dev := -XAUTHORS -XREADME -XNEWS -XTODO




More information about the debian-science-commits mailing list