diff --git a/.gitignore b/.gitignore
index c3a5fa1..18d9c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,24 @@
-docs/index.html
-docs/htmlize.el
-autom4te.cache/
-config.log
-config.status
-src/auto/
-src/ltximg/
-src/qmckl.mod
-*.swp
-*.tar.gz
+.deps/
+compile
+depcomp
+generated.mk
+stamp-h1
+libtool
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
 Makefile
 aclocal.m4
+autom4te.cache/
 config.guess
+config.log
+config.status
 config.sub
 configure
-configure.ac.dist
-include/config.h
-*~
 install-sh
 qmckl.pc
+
diff --git a/Makefile.am b/Makefile.am
index 9b18f07..01f0555 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,15 +52,13 @@ fortran_DATA = $(qmckl_f)
 
 export srcdir qmckl_f qmckl_h
 
-sources_tangled = src/qmckl_ao.c
-
 
 if QMCKL_DEVEL
 # <-----
 dist_src_DATA = $(ORG_FILES)
 
 BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC_FILES) $(H_TYPE_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
-CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES)
+CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES)
 
 # ----->
 endif
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index aa6194f..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,1111 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# QMCkl - Quantum Monte Carlo kernel library
-#
-# BSD 3-Clause License
-#
-# Copyright (c) 2020, TREX Center of Excellence
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@QMCKL_DEVEL_TRUE@am__append_1 = $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES)
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__dist_src_DATA_DIST) \
-	$(include_HEADERS) $(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES = qmckl.pc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__dist_src_DATA_DIST = $(srcdir)/org/qmckl_ao.org \
-	$(srcdir)/org/qmckl_context.org \
-	$(srcdir)/org/qmckl_distance.org \
-	$(srcdir)/org/qmckl_electron.org $(srcdir)/org/qmckl_error.org \
-	$(srcdir)/org/qmckl_memory.org $(srcdir)/org/qmckl_numprec.org \
-	$(srcdir)/org/qmckl.org $(srcdir)/org/README.org \
-	$(srcdir)/org/test_qmckl.org
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(fortrandir)" \
-	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
-DATA = $(dist_src_DATA) $(fortran_DATA) $(pkgconfig_DATA)
-HEADERS = $(include_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/generated.mk \
-	$(srcdir)/qmckl.pc.in $(top_srcdir)/include/config.h.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS README compile \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EMACS = @EMACS@
-EXEEXT = @EXEEXT@
-FC = @FC@
-FCFLAGS = @FCFLAGS@
-FCFLAGS_f90 = @FCFLAGS_f90@
-FCLIBS = @FCLIBS@
-FGREP = @FGREP@
-GREP = @GREP@
-HAS_CPPCHECK = @HAS_CPPCHECK@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CFLAGS = @PKG_CFLAGS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PKG_LIBS = @PKG_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VERSION_MAJOR = @VERSION_MAJOR@
-VERSION_MINOR = @VERSION_MINOR@
-VERSION_PATCH = @VERSION_PATCH@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = 
-CLEANFILES = $(am__append_1)
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(srcdir)/qmckl.pc
-qmckl_h = $(srcdir)/include/qmckl.h
-include_HEADERS = $(qmckl_h)
-qmckl_f = $(srcdir)/share/qmckl/fortran/qmckl_f.f90
-fortrandir = $(datadir)/$(PACKAGE_NAME)/fortran/
-fortran_DATA = $(qmckl_f)
-sources_tangled = src/qmckl_ao.c
-
-# <-----
-@QMCKL_DEVEL_TRUE@dist_src_DATA = $(ORG_FILES)
-@QMCKL_DEVEL_TRUE@BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC_FILES) $(H_TYPE_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
-
-# ----->
-tangle_verbose = $(tangle_verbose_@AM_V@)
-tangle_verbose_ = $(tangle_verbose_@AM_DEFAULT_V@)
-tangle_verbose_0 = @echo "  TANGLE   $@";
-cat_h_verbose = $(cat_h_verbose_@AM_V@)
-cat_h_verbose_ = $(cat_h_verbose_@AM_DEFAULT_V@)
-cat_h_verbose_0 = @echo "  HEADER   $@";
-ORG_FILES = $(srcdir)/org/qmckl_ao.org $(srcdir)/org/qmckl_context.org $(srcdir)/org/qmckl_distance.org $(srcdir)/org/qmckl_electron.org $(srcdir)/org/qmckl_error.org $(srcdir)/org/qmckl_memory.org $(srcdir)/org/qmckl_numprec.org $(srcdir)/org/qmckl.org $(srcdir)/org/README.org $(srcdir)/org/test_qmckl.org 
-C_FILES = $(srcdir)/src/qmckl_ao.c $(srcdir)/src/qmckl_context.c $(srcdir)/src/qmckl_electron.c $(srcdir)/src/qmckl_error.c $(srcdir)/src/qmckl_memory.c $(srcdir)/src/qmckl_numprec.c
-F_FILES = $(srcdir)/src/qmckl_ao_f.f90 $(srcdir)/src/qmckl_distance_f.f90 $(srcdir)/src/qmckl_electron_f.f90
-C_O_FILES = $(srcdir)/src/qmckl_ao.o $(srcdir)/src/qmckl_context.o $(srcdir)/src/qmckl_electron.o $(srcdir)/src/qmckl_error.o $(srcdir)/src/qmckl_memory.o $(srcdir)/src/qmckl_numprec.o
-F_O_FILES = 
-FH_FUNC_FILES = $(srcdir)/src/qmckl_ao_fh_func.f90 $(srcdir)/src/qmckl_context_fh_func.f90 $(srcdir)/src/qmckl_distance_fh_func.f90 $(srcdir)/src/qmckl_error_fh_func.f90 $(srcdir)/src/qmckl_numprec_fh_func.f90
-FH_TYPE_FILES = $(srcdir)/src/qmckl_context_fh_type.f90 $(srcdir)/src/qmckl_error_fh_type.f90
-H_FUNC_FILES = $(srcdir)/src/qmckl_ao_func.h $(srcdir)/src/qmckl_context_func.h $(srcdir)/src/qmckl_distance_func.h $(srcdir)/src/qmckl_electron_func.h $(srcdir)/src/qmckl_error_func.h $(srcdir)/src/qmckl_memory_func.h $(srcdir)/src/qmckl_numprec_func.h
-H_TYPE_FILES = $(srcdir)/src/qmckl_context_type.h $(srcdir)/src/qmckl_error_type.h $(srcdir)/src/qmckl_numprec_type.h
-H_PRIVATE_FUNC_FILES = $(srcdir)/src/qmckl_ao_private_func.h $(srcdir)/src/qmckl_electron_private_func.h $(srcdir)/src/qmckl_memory_private_func.h
-H_PRIVATE_TYPE_FILES = $(srcdir)/src/qmckl_ao_private_type.h $(srcdir)/src/qmckl_context_private_type.h $(srcdir)/src/qmckl_electron_private_type.h $(srcdir)/src/qmckl_error_private_type.h $(srcdir)/src/qmckl_memory_private_type.h $(srcdir)/src/qmckl_numprec_private_type.h
-C_TEST_FILES = $(srcdir)/src/test_qmckl_ao.c $(srcdir)/src/test_qmckl_context.c $(srcdir)/src/test_qmckl_distance.c $(srcdir)/src/test_qmckl_electron.c $(srcdir)/src/test_qmckl_error.c $(srcdir)/src/test_qmckl_memory.c $(srcdir)/src/test_qmckl_numprec.c
-F_TEST_FILES = $(srcdir)/src/test_qmckl_ao_f.f90 $(srcdir)/src/test_qmckl_distance_f.f90
-SUFFIXES = .f90 .h .org .c _f.f90 _func.h _type.h _private_func.h _private_type.h
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .f90 .h .org .c _f.f90 _func.h _type.h _private_func.h _private_type.h
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/generated.mk $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
-	esac;
-$(srcdir)/generated.mk $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-include/config.h: include/stamp-h1
-	@test -f $@ || rm -f include/stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1
-
-include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
-	@rm -f include/stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
-$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f include/stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f include/config.h include/stamp-h1
-qmckl.pc: $(top_builddir)/config.status $(srcdir)/qmckl.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-dist_srcDATA: $(dist_src_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_src_DATA)'; test -n "$(srcdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(srcdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(srcdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(srcdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(srcdir)" || exit $$?; \
-	done
-
-uninstall-dist_srcDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_src_DATA)'; test -n "$(srcdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(srcdir)'; $(am__uninstall_files_from_dir)
-install-fortranDATA: $(fortran_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(fortran_DATA)'; test -n "$(fortrandir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(fortrandir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(fortrandir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(fortrandir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(fortrandir)" || exit $$?; \
-	done
-
-uninstall-fortranDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(fortran_DATA)'; test -n "$(fortrandir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(fortrandir)'; $(am__uninstall_files_from_dir)
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(DATA) $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(fortrandir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-dist_srcDATA install-fortranDATA \
-	install-includeHEADERS install-pkgconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-dist_srcDATA uninstall-fortranDATA \
-	uninstall-includeHEADERS uninstall-pkgconfigDATA
-
-.MAKE: $(am__recursive_targets) all check install install-am \
-	install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dist_srcDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-fortranDATA install-html \
-	install-html-am install-includeHEADERS install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgconfigDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-dist_srcDATA \
-	uninstall-fortranDATA uninstall-includeHEADERS \
-	uninstall-pkgconfigDATA
-
-.PRECIOUS: Makefile
-
-
-export srcdir qmckl_f qmckl_h
-
-$(srcdir)/src/qmckl_context.c $(srcdir)/src/qmckl_context_func.h $(srcdir)/src/qmckl_context_type.h $(srcdir)/src/qmckl_context_private_type.h $(srcdir)/src/qmckl_context_fh_func.f90 $(srcdir)/src/qmckl_context_fh_type.f90 $(srcdir)/src/test_qmckl_context.c : org/qmckl_context.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_context.org
-
-$(srcdir)/src/qmckl_ao.c $(srcdir)/src/qmckl_ao_func.h $(srcdir)/src/qmckl_ao_private_type.h $(srcdir)/src/qmckl_ao_private_func.h $(srcdir)/src/qmckl_ao_f.f90 $(srcdir)/src/qmckl_ao_fh_func.f90 $(srcdir)/src/test_qmckl_ao.c $(srcdir)/src/test_qmckl_ao_f.f90 : org/qmckl_ao.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_ao.org
-
-$(srcdir)/src/qmckl_numprec.c $(srcdir)/src/qmckl_numprec_func.h $(srcdir)/src/qmckl_numprec_type.h $(srcdir)/src/qmckl_numprec_private_type.h $(srcdir)/src/qmckl_numprec_fh_func.f90 $(srcdir)/src/test_qmckl_numprec.c : org/qmckl_numprec.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_numprec.org
-
-$(srcdir)/src/qmckl_electron.c $(srcdir)/src/qmckl_electron_func.h $(srcdir)/src/qmckl_electron_private_type.h $(srcdir)/src/qmckl_electron_private_func.h $(srcdir)/src/qmckl_electron_f.f90 $(srcdir)/src/test_qmckl_electron.c : org/qmckl_electron.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_electron.org
-
-$(srcdir)/src/qmckl_error.c $(srcdir)/src/qmckl_error_func.h $(srcdir)/src/qmckl_error_type.h $(srcdir)/src/qmckl_error_private_type.h $(srcdir)/src/qmckl_error_fh_func.f90 $(srcdir)/src/qmckl_error_fh_type.f90 $(srcdir)/src/test_qmckl_error.c : org/qmckl_error.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_error.org
-
-$(srcdir)/src/qmckl_distance_func.h $(srcdir)/src/qmckl_distance_f.f90 $(srcdir)/src/qmckl_distance_fh_func.f90 $(srcdir)/src/test_qmckl_distance.c $(srcdir)/src/test_qmckl_distance_f.f90 : org/qmckl_distance.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_distance.org
-
-$(srcdir)/src/qmckl_memory.c $(srcdir)/src/qmckl_memory_func.h $(srcdir)/src/qmckl_memory_private_type.h $(srcdir)/src/qmckl_memory_private_func.h $(srcdir)/src/test_qmckl_memory.c : org/qmckl_memory.org
-	$(tangle_verbose)$(srcdir)/tools/tangle.sh org/qmckl_memory.org
-
-$(srcdir)/src/qmckl_ao_f.o: $(srcdir)/src/qmckl_ao_f.f90 $(srcdir)/src/qmckl_ao_fh_func.f90 qmckl_f.o
-$(srcdir)/src/qmckl_ao.o: $(srcdir)/src/qmckl_ao.c $(srcdir)/src/qmckl_ao_func.h $(srcdir)/src/qmckl_ao_private_type.h $(srcdir)/src/qmckl_ao_private_func.h $(qmckl_h)
-$(srcdir)/src/qmckl_context_f.o: $(srcdir)/src/qmckl_context_fh_func.f90 $(srcdir)/src/qmckl_context_fh_type.f90 qmckl_f.o
-$(srcdir)/src/qmckl_context.o: $(srcdir)/src/qmckl_context.c $(srcdir)/src/qmckl_context_func.h $(srcdir)/src/qmckl_context_type.h $(srcdir)/src/qmckl_context_private_type.h $(qmckl_h)
-$(srcdir)/src/qmckl_distance_f.o: $(srcdir)/src/qmckl_distance_f.f90 $(srcdir)/src/qmckl_distance_fh_func.f90 qmckl_f.o
-$(srcdir)/src/qmckl_distance.o: $(srcdir)/src/qmckl_distance_func.h $(qmckl_h)
-$(srcdir)/src/qmckl_electron_f.o: $(srcdir)/src/qmckl_electron_f.f90 qmckl_f.o
-$(srcdir)/src/qmckl_electron.o: $(srcdir)/src/qmckl_electron.c $(srcdir)/src/qmckl_electron_func.h $(srcdir)/src/qmckl_electron_private_type.h $(srcdir)/src/qmckl_electron_private_func.h $(qmckl_h)
-$(srcdir)/src/qmckl_error_f.o: $(srcdir)/src/qmckl_error_fh_func.f90 $(srcdir)/src/qmckl_error_fh_type.f90 qmckl_f.o
-$(srcdir)/src/qmckl_error.o: $(srcdir)/src/qmckl_error.c $(srcdir)/src/qmckl_error_func.h $(srcdir)/src/qmckl_error_type.h $(srcdir)/src/qmckl_error_private_type.h $(qmckl_h)
-$(srcdir)/src/qmckl_memory.o: $(srcdir)/src/qmckl_memory.c $(srcdir)/src/qmckl_memory_func.h $(srcdir)/src/qmckl_memory_private_type.h $(srcdir)/src/qmckl_memory_private_func.h $(qmckl_h)
-$(srcdir)/src/qmckl_numprec_f.o: $(srcdir)/src/qmckl_numprec_fh_func.f90 qmckl_f.o
-$(srcdir)/src/qmckl_numprec.o: $(srcdir)/src/qmckl_numprec.c $(srcdir)/src/qmckl_numprec_func.h $(srcdir)/src/qmckl_numprec_type.h $(srcdir)/src/qmckl_numprec_private_type.h $(qmckl_h)
-$(srcdir)/src/test_qmckl_ao_f.o: $(srcdir)/src/test_qmckl_ao_f.f90 $(srcdir)/src/qmckl_ao_f.o qmckl_f.o
-$(srcdir)/src/test_qmckl_ao.o: $(srcdir)/src/test_qmckl_ao.c $(srcdir)/src/qmckl_ao.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_context.o: $(srcdir)/src/test_qmckl_context.c $(srcdir)/src/qmckl_context.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_distance_f.o: $(srcdir)/src/test_qmckl_distance_f.f90 $(srcdir)/src/qmckl_distance_f.o qmckl_f.o
-$(srcdir)/src/test_qmckl_distance.o: $(srcdir)/src/test_qmckl_distance.c $(srcdir)/src/qmckl_distance.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_electron.o: $(srcdir)/src/test_qmckl_electron.c $(srcdir)/src/qmckl_electron.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_error.o: $(srcdir)/src/test_qmckl_error.c $(srcdir)/src/qmckl_error.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_memory.o: $(srcdir)/src/test_qmckl_memory.c $(srcdir)/src/qmckl_memory.o $(qmckl_h)
-$(srcdir)/src/test_qmckl_numprec.o: $(srcdir)/src/test_qmckl_numprec.c $(srcdir)/src/qmckl_numprec.o $(qmckl_h)
-
-$(srcdir)/generated.mk: $(ORG_FILES)
-	$(srcdir)/tools/build_makefile.sh
-
-$(qmckl_h): $(H_FUNC_FILES) $(H_TYPE_FILES)
-	$(cat_h_verbose)$(srcdir)/tools/build_qmckl_h.sh
-
-$(qmckl_f): $(FH_FUNC_FILES) $(FH_TYPE_FILES)
-	$(cat_h_verbose)$(srcdir)/tools/build_qmckl_f.sh
-
-$(srcdir)/src/qmckl_f.f90: $(qmckl_f)
-	cp $(qmckl_f) $(srcdir)/src/qmckl_f.f90
-
-#lib_LTLIBRARIES = $(top_srcdir)/src/libqmckl.la
-#
-#$(top_srcdir)/src/libqmckl.la;
-#	$(MAKE) -C src libqmckl.la
-#
-
-rpms srcrpm:
-	for dir in $(SUBDIRS); do \
-	  (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
-	done
-
-.PHONY: rpms srcrpm
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/org/.gitignore b/org/.gitignore
new file mode 100644
index 0000000..0e4e804
--- /dev/null
+++ b/org/.gitignore
@@ -0,0 +1 @@
+*.tangled
diff --git a/src/.gitignore b/src/.gitignore
index aa0bfb8..f027a21 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -6,6 +6,3 @@
 *.html
 *~
 *.so
-Makefile.generated
-test_qmckl
-merged_qmckl.org
diff --git a/tools/build_makefile.sh b/tools/build_makefile.sh
index 9641f80..e22185e 100755
--- a/tools/build_makefile.sh
+++ b/tools/build_makefile.sh
@@ -2,13 +2,12 @@
 #
 # Creates all the dependencies from the org-mode files
 
-set -e
-
 if [[ -z ${srcdir} ]] ; then
    echo "Error: srcdir environment variable is not defined"
    exit 1
 fi
 
+
 WD=$PWD
 
 function make_src()
@@ -28,10 +27,17 @@ function make_src()
     H_PRIVATE_TYPE_FILES=
     C_TEST_FILES=
     F_TEST_FILES=
+    TANGLED_FILES=
 
     for org in org/*.org ; do
-        ORG_FILES+="\$(srcdir)/$org "
+        tangled="\$(srcdir)/${org%.org}.tangled"
+
         i=${org%.org}
+        c_test_o="\$(srcdir)/src/test_${i}.o"
+        f_test_o="\$(srcdir)/src/test_${i}_f.o"
+        c_test="\$(srcdir)/src/test_${i}.c"
+        f_test="\$(srcdir)/src/test_${i}_f.f90"
+
         i="\$(srcdir)/src/${i#org/}"
         c="${i}.c"
         o="${i}.o"
@@ -44,9 +50,13 @@ function make_src()
         fh_func="${i}_fh_func.f90"
         fh_type="${i}_fh_type.f90"
 
+        ORG_FILES+="\$(srcdir)/$org "
+        TANGLED_FILES+="$tangled "
+        DEPS_ORG["\$(srcdir)/$org"]=$tangled
+
         grep -q "(eval c)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$c "
+            DEPS[$c]+=" $tangled"
             DEPS[$o]+=" $c "
             C_FILES+=" $c"
             C_O_FILES+=" $o"
@@ -54,76 +64,64 @@ function make_src()
 
         grep -q "(eval h_func)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$h_func "
             DEPS[$o]+=" $h_func"
+            DEPS[$h_func]+=" $tangled"
             H_FUNC_FILES+=" $h_func"
         fi
 
         grep -q "(eval h_type)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$h_type "
             DEPS[$o]+=" $h_type"
+            DEPS[$h_type]+=" $tangled"
             H_TYPE_FILES+=" $h_type"
         fi
 
         grep -q "(eval h_private_type)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$h_private_type "
             DEPS[$o]+=" $h_private_type"
+            DEPS[$h_private_type]+=" $tangled"
             H_PRIVATE_TYPE_FILES+=" $h_private_type"
         fi
 
         grep -q "(eval h_private_func)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$h_private_func "
             DEPS[$o]+=" $h_private_func"
+            DEPS[$h_private_func]+=" $tangled"
             H_PRIVATE_FUNC_FILES+=" $h_private_func"
         fi
 
         grep -q "(eval f)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$f90 "
+            DEPS[$f90]+="$tangled "
             DEPS[$fo]+="$f90 "
             F_FILES+=" $f90"
         fi
 
         grep -q "(eval fh_func)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$fh_func "
             DEPS[$fo]+=" $fh_func"
+            DEPS[$fh_func]+=" $tangled"
             FH_FUNC_FILES+=" $fh_func"
         fi
 
         grep -q "(eval fh_type)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$fh_type "
             DEPS[$fo]+=" $fh_type"
+            DEPS[$fh_type]+=" $tangled"
             FH_TYPE_FILES+=" $fh_type"
         fi
-    done
 
-    for org in org/*.org ; do
-        i=${org%.org}
-        i=${i#org/}
-        o="\$(srcdir)/src/${i}.o"
-        fo="\$(srcdir)/src/${i}_f.o"
-        c="\$(srcdir)/src/${i}.c"
-        f90="\$(srcdir)/src/${i}_f.f90"
-        c_test_o="\$(srcdir)/src/test_${i}.o"
-        f_test_o="\$(srcdir)/src/test_${i}_f.o"
-        c_test="\$(srcdir)/src/test_${i}.c"
-        f_test="\$(srcdir)/src/test_${i}_f.f90"
         grep -q "(eval c_test)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$c_test "
-            DEPS[$c_test_o]+=" $c_test $o"
+            DEPS["$c_test"]="${tangled} "
+            DEPS["$c_test_o"]+=" $c_test $o"
             C_TEST_FILES+=" $c_test"
         fi
 
         grep -q "(eval f_test)" $org
         if [[ $? -eq 0 ]] ; then
-            DEPS_ORG[$org]+="$f_test "
-            DEPS[$f_test_o]+=" $f_test $fo"
+            DEPS["$f_test"]+="${tangled} "
+            DEPS["$f_test_o"]+=" $f_test $fo"
             F_TEST_FILES+=" $f_test"
         fi
     done
@@ -160,6 +158,7 @@ function make_src()
     echo "## Source files" > ${OUTPUT}
     echo >> ${OUTPUT}
     echo "ORG_FILES=${ORG_FILES}" >> ${OUTPUT}
+    echo "TANGLED_FILES=${TANGLED_FILES}" >> ${OUTPUT}
     echo "C_FILES=${C_FILES}" >> ${OUTPUT}
     echo "F_FILES=${F_FILES}" >> ${OUTPUT}
     echo "C_O_FILES=${C_O_FILES}" >> ${OUTPUT}
diff --git a/tools/tangle.sh b/tools/tangle.sh
index 63b8ded..a94189d 100755
--- a/tools/tangle.sh
+++ b/tools/tangle.sh
@@ -32,6 +32,10 @@ function tangle()
 
 for i in $@
 do
-#    echo "--- ${i} ----"
-    tangle ${i}
+    tangled=${i%.org}.tangled
+    NOW=$(date +"%m%d%H%M.%S")
+    tangle ${i} &> $tangled
+
+    # Make log file older than the tangled files
+    touch -t ${NOW} $tangled
 done