diff --git a/Makefile.am b/Makefile.am
index fbe62e0..86d8e50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,11 +47,11 @@ pkgconfig_DATA = pkgconfig/qmckl.pc
 qmckl_h = $(srcdir)/include/qmckl.h
 include_HEADERS = $(qmckl_h)
 
-qmckl_f  = share/qmckl/fortran/qmckl_f.f90
-test_qmckl_f = tests/qmckl_f.f90
+qmckl_f       = share/qmckl/fortran/qmckl_f.f90
+test_qmckl_f  = tests/qmckl_f.f90
 test_qmckl_fo = tests/qmckl_f.o
-src_qmckl_f = src/qmckl_f.f90
-src_qmckl_fo = src/qmckl_f.o
+src_qmckl_f   = src/qmckl_f.f90
+src_qmckl_fo  = src/qmckl_f.o
 
 fortrandir = $(datadir)/$(PACKAGE_NAME)/fortran/
 dist_fortran_DATA = $(qmckl_f)
@@ -104,9 +104,6 @@ doc: html text
 
 if QMCKL_DEVEL
 
-generated.mk: $(ORG_FILES)
-	python $(srcdir)/tools/build_makefile.py
-
 dist_src_DATA = $(ORG_FILES) $(TANGLED_FILES) $(EXPORTED_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) $(qmckl_f) $(qmckl_h)
@@ -115,7 +112,7 @@ CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES)
 
 EXTRA_DIST +=                 \
     tools/build_doc.sh        \
-    tools/build_makefile.sh   \
+    tools/build_makefile.py   \
     tools/build_qmckl_f.sh    \
     tools/build_qmckl_h.sh    \
     tools/config_doc.el       \
@@ -157,4 +154,7 @@ $(qmckl_f): $(FH_FUNC_FILES) $(FH_TYPE_FILES)
 $(htmlize_el):
 	$(srcdir)/tools/install_htmlize.sh $(htmlize_el)
 
+generated.mk: $(ORG_FILES)
+	python $(srcdir)/tools/build_makefile.py
+
 endif
diff --git a/configure.ac b/configure.ac
index 97fd524..d555558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,7 @@ AM_CONDITIONAL([QMCKL_DEVEL],[test "x$QMCKL_DEVEL" != x])
 
 if test "x${QMCKL_DEVEL}" != "x"; then
 
+  QMCKL_DEVEL=" -- Developer mode"
   AC_PROG_AWK
   AC_CHECK_PROGS([PYTHON],[python python3 python2],[no])
   if test x${PYTHON} == xno ; then
@@ -221,7 +222,7 @@ AC_OUTPUT
 echo \
 "-------------------------------------------------
 
-${PACKAGE_NAME} Version ${PACKAGE_VERSION}
+${PACKAGE_NAME} Version ${PACKAGE_VERSION} ${QMCKL_DEVEL}
 
 Prefix: '${prefix}'.
 
diff --git a/tools/build_makefile.py b/tools/build_makefile.py
index ff09b1d..5290b3f 100755
--- a/tools/build_makefile.py
+++ b/tools/build_makefile.py
@@ -228,13 +228,12 @@ def main():
               "## Test files",
               "",
               "$(test_qmckl_fo): $(test_qmckl_f)"]
-    for f in sorted(TESTS.keys()):
-        output += [ f + "$(EXEEXT): " + " ".join(TESTS[f]) ]
     output += ["",
                 "check_PROGRAMS = $(TESTS)" ]
     for f in sorted(TESTS.keys()):
         prefix = "tests_" + f.rsplit("/",1)[-1]
-        output += [ prefix + "_SOURCES = " + " ".join(TESTS[f]).replace("$(srcdir)",""),
+        output += [ prefix + "_SOURCES = " + \
+                    " ".join(TESTS[f]).replace("$(srcdir)",""),
                     prefix + "_LDADD   = src/libqmckl.la", 
                     prefix + "_LDFLAGS = -no-install",
                     "" ]