Small changes

.gitignore

@@ -43,6 +43,12 @@ install-sh
 Makefile.in
 missing
 NEWS
+src/.deps/**
+src/.dirstamp
+src/Makefile
+src/Makefile.in
+inc/stamp-h1
+inc/config.h*
 nint/.deps/**
 nint/Makefile
 nint/Makefile.in

Makefile.am

@@ -4,6 +4,5 @@ ACLOCAL_AMFLAGS = -I m4 --install
 SUBDIRS = nint src inc
 
 lib_LIBRARIES = libfastmath.a
-include_HEADERS = inc/config.h inc/fastapprox.h inc/FastBitset.h inc/FastMath.h inc/FastNumInt.h inc/stopwatch.h nint/nint.hpp
 libfastmath_a_LIBADD = nint/nint.o src/FastMath.o src/FastNumInt.o src/stopwatch.o
 libfastmath_a_SOURCES = 

configure.ac

@@ -12,9 +12,6 @@ AC_PROG_RANLIB
 
 AC_LANG([C++])
 
-#var=($(for file in $(find inc/intrinsics -type f) ; do echo $(basename $file) ; done))
-#echo ${var[[@]]}
-
 AX_COMPILER_VERSION
 AX_COMPARE_VERSION([$ax_cv_cxx_compiler_version], [ge], [4.8.1],, AC_MSG_ERROR([GNU compiler must be at least version 4.8.1]))
 AX_CXX_COMPILE_STDCXX([11])
@@ -28,7 +25,7 @@ AC_CHECK_LIB([stdc++], [main],, AC_MSG_ERROR([Could not find the library "libstd
 
 AC_CHECK_FILES([src/stopwatch.cpp src/FastMath.cpp src/FastNumInt.cpp],, AC_MSG_ERROR([Could not find fastmath source files.]))
 AC_CHECK_FILES([inc/stopwatch.h inc/FastMath.h inc/FastNumInt.h inc/FastBitset.h inc/fastapprox.h],, AC_MSG_ERROR([Could not find fastmath header files.]))
-AC_CHECK_FILES([nint/nint.cpp nint/nint.hpp],, AC_MSG_ERROR([Could not find nint files.]))
+AC_CHECK_FILES([nint/nint.cpp nint/nint.h],, AC_MSG_ERROR([Could not find nint files.]))
 
 AC_CHECK_HEADERS([assert.h cstdlib algorithm cstring inttypes.h limits.h math.h new stddef.h stdio.h stdlib.h sstream stdint.h],, AC_MSG_ERROR([Could not find system header files.]))
 AC_CHECK_HEADER([emmintrin.h],, AC_MSG_ERROR([Could not find SSE header file.]))
@@ -46,14 +43,13 @@ AC_C_INLINE
 AC_C_CONST
 AC_C_VOLATILE
 
-CXXFLAGS="-g -O3 -DBOOST_NO_FENV_H -Wno-narrowing -mpopcnt"
-AX_GCC_X86_CPU_SUPPORTS([avx2], [CXXFLAGS+=" -mavx2 -DAVX2_ENABLED";], [CXXFLAGS+=""])
+CXXFLAGS="$CXXFLAGS -g -O3 -DBOOST_NO_FENV_H -Wno-narrowing -mpopcnt"
+AX_GCC_X86_CPU_SUPPORTS([avx2], [CXXFLAGS="$CXXFLAGS -mavx2 -DAVX2_ENABLED";], [CXXFLAGS+=""])
 AX_GCC_X86_CPU_SUPPORTS([popcnt],, AC_MSG_ERROR([CPU does not support popcnt instruction.]))
 AX_GCC_ARCHFLAG([no],, AC_MSG_ERROR([CPU architecture could not be identified.]))
-CXXFLAGS+=" $ax_cv_gcc_archflag"
+CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
 
 xtra=($(for file in $(find inc/intrinsics -type f) ; do echo intrinsics/$(basename $file) ; done))
-#xtra=($(for file in $(find inc/intrinsics -type f) ; do echo $file ; done))
 AC_SUBST([xtra], ["${xtra[[@]]}"])
 
 AC_CONFIG_FILES([Makefile nint/Makefile src/Makefile inc/Makefile])

inc/FastNumInt.h

@@ -6,7 +6,7 @@
 
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_integration.h>
-#include <nint/nint.hpp>
+#include <nint.h>
 
 #define FNI_DEBUG true
 

inc/Makefile.am

@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4 --install
 
+include_HEADERS = config.h fastapprox.h FastBitset.h FastMath.h FastNumInt.h stopwatch.h
 nobase_include_HEADERS = @xtra@
 EXTRA_HEADERS =

inc/config.h

@@ -87,7 +87,7 @@
 #define HAVE_NINT_NINT_CPP 1
 
 /* Define to 1 if you have the file `AC_File'. */
-#define HAVE_NINT_NINT_HPP 1
+#define HAVE_NINT_NINT_H 1
 
 /* Define if popcnt instructions are supported */
 #define HAVE_POPCNT_INSTRUCTIONS 1

inc/config.h.in

@@ -86,7 +86,7 @@
 #undef HAVE_NINT_NINT_CPP
 
 /* Define to 1 if you have the file `AC_File'. */
-#undef HAVE_NINT_NINT_HPP
+#undef HAVE_NINT_NINT_H
 
 /* Define if popcnt instructions are supported */
 #undef HAVE_POPCNT_INSTRUCTIONS

nint/Makefile.am

@@ -2,4 +2,5 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4 --install
 
 noinst_LIBRARIES = libnint.a
+include_HEADERS = nint.h
 libnint_a_SOURCES = nint.cpp

nint/nint.cpp

@@ -6,7 +6,7 @@
 
 using namespace std;
 
-# include "nint.hpp"
+# include "nint.h"
 
 //****************************************************************************80