[SCM] Fast arithmetic with dense matrices over F_{2^e} branch, upstream, updated. 9faf6ece9a183a703670566609063ab274b1c544

[Martin Albrecht]

The following commit has been merged in the upstream branch:
commit a361b50b8b7bf8c2c5578ba654c1f13484a535ca
Author: Martin Albrecht <martinralbrecht at googlemail.com>
Date:   Thu Jun 21 17:37:35 2012 +0100

    "make dist" should produce something that works now

diff --git a/Makefile.am b/Makefile.am
index a46b0a9..adc059d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,32 +4,37 @@ AM_CFLAGS=${SIMD_FLAGS} ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${M4RIE_M4RI_CFLAGS} ${M
 
 lib_LTLIBRARIES = libm4rie.la
 
-libm4rie_la_SOURCES = src/gf2e.c \
-	src/mzed.c \
-	src/newton_john.c \
-	src/echelonform.c \
-	src/strassen.c \
-	src/mzd_slice.c \
-	src/mzd_poly.c \
-	src/trsm.c \
-	src/ple.c \
-	src/conversion.c
+libm4rie_la_SOURCES = m4rie/gf2e.c \
+	m4rie/mzed.c \
+	m4rie/newton_john.c \
+	m4rie/echelonform.c \
+	m4rie/strassen.c \
+	m4rie/mzd_slice.c \
+	m4rie/mzd_poly.c \
+	m4rie/trsm.c \
+	m4rie/ple.c \
+	m4rie/conversion.c \
+	m4rie/mzd_slice_intro.inl \
+	m4rie/mzd_slice_outro.inl \
+	m4rie/mzed_intro.inl \
+	m4rie/mzed_outro.inl \
+	m4rie/trsm.inl
 
 pkgincludesubdir = $(includedir)/m4rie
 
-pkgincludesub_HEADERS = src/gf2e.h \
-	src/mzed.h \
-	src/m4rie.h \
-	src/m4ri_functions.h \
-	src/newton_john.h \
-	src/echelonform.h \
-	src/strassen.h \
-	src/mzd_slice.h \
-	src/mzd_poly.h \
-	src/trsm.h \
-	src/ple.h \
-	src/permutation.h \
-	src/conversion.h \
+pkgincludesub_HEADERS = m4rie/gf2e.h \
+	m4rie/mzed.h \
+	m4rie/m4rie.h \
+	m4rie/m4ri_functions.h \
+	m4rie/newton_john.h \
+	m4rie/echelonform.h \
+	m4rie/strassen.h \
+	m4rie/mzd_slice.h \
+	m4rie/mzd_poly.h \
+	m4rie/trsm.h \
+	m4rie/ple.h \
+	m4rie/permutation.h \
+	m4rie/conversion.h \
 	gf2e_cxx/finite_field_givaro.h
 
 libm4rie_la_LDFLAGS = -release 0.0.$(RELEASE) -no-undefined ${M4RIE_M4RI_LDFLAGS}
diff --git a/configure.ac b/configure.ac
index 9838772..f78149f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl AC_PREREQ([2.64])
 
 AC_CANONICAL_HOST
 
-AC_CONFIG_SRCDIR(src/newton_john.c)
+AC_CONFIG_SRCDIR(m4rie/newton_john.c)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_PROG_LIBTOOL
 
 AC_PROG_INSTALL
 
-AC_CONFIG_HEADERS(src/config.h)
+AC_CONFIG_HEADERS(m4rie/config.h)
 
 AC_PROG_CXX
 
diff --git a/src/config.h.in b/src/config.h.in
index 3234964..9d25f62 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,4 +1,4 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+/* m4rie/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H

-- 
Fast arithmetic with dense matrices over F_{2^e}