2007-05-09 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac (ac_cv_mpi_config_done): Unused variable removed.
	(ac_cv_mpi_mod_list, MPI_MOD_LIST_LO, MPI_MOD_LIST_O): Removed.
	(MPI_MOD_ASM_MPIH_ADD1, MPI_MOD_ASM_MPIH_SUB1,
	MPI_MOD_ASM_MPIH_MUL1, MPI_MOD_ASM_MPIH_MUL2,
	MPI_MOD_ASM_MPIH_MUL3, MPI_MOD_ASM_MPIH_LSHIFT,
	MPI_MOD_ASM_MPIH_RSHIFT, MPI_MOD_ASM_MPIH_UDIV,
	MPI_MOD_ASM_MPIH_UDIV_QRNND, MPI_MOD_C_MPIH_ADD1,
	MPI_MOD_C_MPIH_SUB1, MPI_MOD_C_MPIH_MUL1, MPI_MOD_C_MPIH_MUL2,
	MPI_MOD_C_MPIH_MUL3, MPI_MOD_C_MPIH_LSHIFT, MPI_MOD_C_MPIH_RSHIFT,
	MPI_MOD_C_MPIH_UDIV, MPI_MOD_C_MPIH_UDIV_QRNND): New automake
	variables.

mpi/
2007-05-09  Marcus Brinkmann  <marcus@g10code.de>

	* config.links: Rename assembler file links by suffixing "-asm".
	* Makefile.am (CCASCOMPILE, LTCCASCOMPILE, CLEANFILES,
	libmpi_la_LIBADD, libmpi_la_DEPENDENCIES, SUFFIXES, .S.o, .S.obj,
	.S.lo): Removed variables and targets.
	(mpih_add1, mpih_sub1, mpih_mul1, mpih_mul2, mpih_mul3,
	mpih_lshift, mpih_rshift, mpih_udiv, mpih_udiv_qrnnd,
	nodist_libmpi_la_SOURCES): New variables.
	(DISTCLEANFILES): Rename assembler file links by suffixing "-asm".
	Add variants for C file links.

5 files changed, 143 insertions, 139 deletions

diff --git a/ChangeLog b/ChangeLog
index f65c55be..f0dd9e6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-05-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac (ac_cv_mpi_config_done): Unused variable removed.
+	(ac_cv_mpi_mod_list, MPI_MOD_LIST_LO, MPI_MOD_LIST_O): Removed.
+	(MPI_MOD_ASM_MPIH_ADD1, MPI_MOD_ASM_MPIH_SUB1,
+	MPI_MOD_ASM_MPIH_MUL1, MPI_MOD_ASM_MPIH_MUL2,
+	MPI_MOD_ASM_MPIH_MUL3, MPI_MOD_ASM_MPIH_LSHIFT,
+	MPI_MOD_ASM_MPIH_RSHIFT, MPI_MOD_ASM_MPIH_UDIV,
+	MPI_MOD_ASM_MPIH_UDIV_QRNND, MPI_MOD_C_MPIH_ADD1,
+	MPI_MOD_C_MPIH_SUB1, MPI_MOD_C_MPIH_MUL1, MPI_MOD_C_MPIH_MUL2,
+	MPI_MOD_C_MPIH_MUL3, MPI_MOD_C_MPIH_LSHIFT, MPI_MOD_C_MPIH_RSHIFT,
+	MPI_MOD_C_MPIH_UDIV, MPI_MOD_C_MPIH_UDIV_QRNND): New automake
+	variables.
+
 2007-05-04  Werner Koch  <wk@g10code.com>
 
 	Released 1.3.0.
diff --git a/configure.ac b/configure.ac
index 3f444463..b1a0e4e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,27 +674,34 @@ AC_MSG_CHECKING(for mpi assembler functions)
 if test -f $srcdir/mpi/config.links ; then
     . $srcdir/mpi/config.links
     AC_CONFIG_LINKS("$mpi_ln_list")
-    ac_cv_mpi_mod_list="$mpi_mod_list"
     ac_cv_mpi_sflags="$mpi_sflags"
-    ac_cv_mpi_config_done="yes"
     AC_MSG_RESULT(done)
 else
     AC_MSG_RESULT(failed)
     AC_MSG_ERROR([mpi/config.links missing!])
 fi
-MPI_MOD_LIST_LO=""
-MPI_MOD_LIST_O=""
-if test "$ac_cv_mpi_mod_list" != ""; then
-  for i in $ac_cv_mpi_mod_list; do
-      MPI_MOD_LIST_LO="$MPI_MOD_LIST_LO $i.lo"
-      MPI_MOD_LIST_O="$MPI_MOD_LIST_O $i.o"
-  done
-fi
-AC_SUBST(MPI_MOD_LIST_LO)
-AC_SUBST(MPI_MOD_LIST_O)
 MPI_SFLAGS="$ac_cv_mpi_sflags"
 AC_SUBST(MPI_SFLAGS)
 
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_ADD1, test "$mpi_mod_asm_mpih_add1" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_SUB1, test "$mpi_mod_asm_mpih_sub1" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL1, test "$mpi_mod_asm_mpih_mul1" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL2, test "$mpi_mod_asm_mpih_mul2" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL3, test "$mpi_mod_asm_mpih_mul3" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_LSHIFT, test "$mpi_mod_asm_mpih_lshift" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_MPIH_RSHIFT, test "$mpi_mod_asm_mpih_rshift" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_UDIV, test "$mpi_mod_asm_mpih_udiv" = yes)
+AM_CONDITIONAL(MPI_MOD_ASM_UDIV_QRNND, test "$mpi_mod_asm_mpih_udiv_qrnnd" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_ADD1, test "$mpi_mod_c_mpih_add1" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_SUB1, test "$mpi_mod_c_mpih_sub1" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL1, test "$mpi_mod_c_mpih_mul1" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL2, test "$mpi_mod_c_mpih_mul2" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL3, test "$mpi_mod_c_mpih_mul3" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_LSHIFT, test "$mpi_mod_c_mpih_lshift" = yes)
+AM_CONDITIONAL(MPI_MOD_C_MPIH_RSHIFT, test "$mpi_mod_c_mpih_rshift" = yes)
+AM_CONDITIONAL(MPI_MOD_C_UDIV, test "$mpi_mod_c_mpih_udiv" = yes)
+AM_CONDITIONAL(MPI_MOD_C_UDIV_QRNND, test "$mpi_mod_c_mpih_udiv_qrnnd" = yes)
+
 # Allow users to append something to the version string without
 # flagging it as development version.  The user version part is
 # considered everything after a dash.
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 5f9ea38f..7fb3d9b0 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* config.links: Rename assembler file links by suffixing "-asm".
+	* Makefile.am (CCASCOMPILE, LTCCASCOMPILE, CLEANFILES,
+	libmpi_la_LIBADD, libmpi_la_DEPENDENCIES, SUFFIXES, .S.o, .S.obj,
+	.S.lo): Removed variables and targets.
+	(mpih_add1, mpih_sub1, mpih_mul1, mpih_mul2, mpih_mul3,
+	mpih_lshift, mpih_rshift, mpih_udiv, mpih_udiv_qrnnd,
+	nodist_libmpi_la_SOURCES): New variables.
+	(DISTCLEANFILES): Rename assembler file links by suffixing "-asm".
+	Add variants for C file links.
+
 2007-05-04  Werner Koch  <wk@g10code.com>
 
 	* config.links (path): Allowthe sue of colons as delimiters. 
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index c1e8c9f5..edfc5dfd 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -29,23 +29,17 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 AM_ASFLAGS = $(MPI_SFLAGS)
 AM_CCASFLAGS = $(NOEXECSTACK_FLAGS)
 
-
-# We don't have .S sources listed, so automake does not autocreate these
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-
-
 EXTRA_DIST = Manifest config.links
 DISTCLEANFILES = mpi-asm-defs.h \
-                 mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
-		 mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h \
+                 mpih-add1-asm.S mpih-mul1-asm.S mpih-mul2-asm.S mpih-mul3-asm.S  \
+		 mpih-lshift-asm.S mpih-rshift-asm.S mpih-sub1-asm.S asm-syntax.h \
+                 mpih-add1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c  \
+		 mpih-lshift.c mpih-rshift.c mpih-sub1.c \
 	         sysdep.h mod-source-info.h
-# Note: we only use .S files so we should delete all left over .s
-CLEANFILES = _*.s __*.s
 
 # Beware: The following list is not a comment but grepped by
 #         config.links to get the list of symlinked modules
-#         Optional modules are marked with a 0 in the second column.
+#         Optional modules are marked with an O in the second column.
 #BEGIN_ASM_LIST
 # mpih-add1    C
 # mpih-sub1    C
@@ -65,99 +59,102 @@ CLEANFILES = _*.s __*.s
 # And we need to have conditionals for all modules because
 # we don't know whether they are .c or .S.  Very ugly; I know.
 # Remember to define them all in configure.ac
-# if MPI_MOD_ASM_MPIH_ADD1
-# mpih_add1 = mpih-add1.S
-# else
-# if MPI_MOD_C_MPIH_ADD1
-# mpih_add1 = mpih-add1.c
-# else
-# mpih_add1 = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_SUB1
-# mpih_sub1 = mpih-sub1.S
-# else
-# if MPI_MOD_C_MPIH_SUB1
-# mpih_sub1 = mpih-sub1.c
-# else
-# mpih_sub1 = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_MUL1
-# mpih_mul1 = mpih-mul1.S
-# else
-# if MPI_MOD_C_MPIH_MUL1
-# mpih_mul1 = mpih-mul1.c
-# else
-# mpih_mul1 = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_MUL2
-# mpih_mul2 = mpih-mul2.S
-# else
-# if MPI_MOD_C_MPIH_MUL2
-# mpih_mul2 = mpih-mul2.c
-# else
-# mpih_mul2 = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_MUL3
-# mpih_mul3 = mpih-mul3.S
-# else
-# if MPI_MOD_C_MPIH_MUL3
-# mpih_mul3 = mpih-mul3.c
-# else
-# mpih_mul3 = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_LSHIFT
-# mpih_lshift = mpih-lshift.S
-# else
-# if MPI_MOD_C_MPIH_LSHIFT
-# mpih_lshift = mpih-lshift.c
-# else
-# mpih_lshift = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_MPIH_RSHIFT
-# mpih_rshift = mpih-rshift.S
-# else
-# if MPI_MOD_C_MPIH_RSHIFT
-# mpih_rshift = mpih-rshift.c
-# else
-# mpih_rshift = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_UDIV
-# udiv = udiv.S
-# else
-# if MPI_MOD_C_UDIV
-# udiv = udiv.c
-# else
-# udiv = 
-# endif
-# endif
-# 
-# if MPI_MOD_ASM_UDIV_QRNND
-# udiv_qrnnd = udiv-qrnnd.S
-# else
-# if MPI_MOD_C_UDIV_QRNND
-# udiv_qrnnd = udiv-qrnnd.c
-# else
-# udiv_qrnnd = 
-# endif
-# endif
+if MPI_MOD_ASM_MPIH_ADD1
+mpih_add1 = mpih-add1-asm.S
+else
+if MPI_MOD_C_MPIH_ADD1
+mpih_add1 = mpih-add1.c
+else
+mpih_add1 = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_SUB1
+mpih_sub1 = mpih-sub1-asm.S
+else
+if MPI_MOD_C_MPIH_SUB1
+mpih_sub1 = mpih-sub1.c
+else
+mpih_sub1 = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_MUL1
+mpih_mul1 = mpih-mul1-asm.S
+else
+if MPI_MOD_C_MPIH_MUL1
+mpih_mul1 = mpih-mul1.c
+else
+mpih_mul1 = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_MUL2
+mpih_mul2 = mpih-mul2-asm.S
+else
+if MPI_MOD_C_MPIH_MUL2
+mpih_mul2 = mpih-mul2.c
+else
+mpih_mul2 = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_MUL3
+mpih_mul3 = mpih-mul3-asm.S
+else
+if MPI_MOD_C_MPIH_MUL3
+mpih_mul3 = mpih-mul3.c
+else
+mpih_mul3 = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_LSHIFT
+mpih_lshift = mpih-lshift-asm.S
+else
+if MPI_MOD_C_MPIH_LSHIFT
+mpih_lshift = mpih-lshift.c
+else
+mpih_lshift = 
+endif
+endif
+
+if MPI_MOD_ASM_MPIH_RSHIFT
+mpih_rshift = mpih-rshift-asm.S
+else
+if MPI_MOD_C_MPIH_RSHIFT
+mpih_rshift = mpih-rshift.c
+else
+mpih_rshift = 
+endif
+endif
+
+if MPI_MOD_ASM_UDIV
+udiv = udiv-asm.S
+else
+if MPI_MOD_C_UDIV
+udiv = udiv.c
+else
+udiv = 
+endif
+endif
+
+if MPI_MOD_ASM_UDIV_QRNND
+udiv_qrnnd = udiv-qrnnd-asm.S
+else
+if MPI_MOD_C_UDIV_QRNND
+udiv_qrnnd = udiv-qrnnd.c
+else
+udiv_qrnnd = 
+endif
+endif
 
 noinst_LTLIBRARIES = libmpi.la
 
 libmpi_la_LDFLAGS =
+nodist_libmpi_la_SOURCES = $(mpih_add1) $(mpih_sub1) $(mpih_mul1) \
+	$(mpih_mul2) $(mpih_mul3) $(mpih_lshift) $(mpih_rshift) \
+	$(udiv) $(udiv_qrnnd)
 libmpi_la_SOURCES = longlong.h	   \
 	      mpi-add.c      \
 	      mpi-bit.c      \
@@ -178,29 +175,3 @@ libmpi_la_SOURCES = longlong.h	   \
 	      mpih-mul.c     \
 	      mpiutil.c      \
               ec.c
-
-libmpi_la_LIBADD = @MPI_MOD_LIST_LO@
-libmpi_la_DEPENDENCIES = @MPI_MOD_LIST_LO@
-
-
-# Because we are circumventing automake with regards to assembler
-# files, we have to define our own rules.
-
-SUFFIXES = .S .o .obj .lo
-
-.S.o:
-	$(CPP) $(INCLUDES) $(AM_CPPFLAGS) $(DEFS) \
-           `test -f '$<' || echo '$(srcdir)/'`$< \
-           | grep -v '^#' > $*.s
-	$(CCASCOMPILE) -c `test -f '$*.s' || echo '$(srcdir)/'`$*.s
-	rm $*.s
-
-.S.obj:
-	$(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.S.lo:
-	$(CPP) $(INCLUDES) $(AM_CPPFLAGS) $(DEFS) \
-           `test -f '$<' || echo '$(srcdir)/'`$< \
-           | grep -v '^#' > $*.s
-	$(LTCCASCOMPILE) -c -o $@ `test -f '$*.s' || echo '$(srcdir)/'`$*.s
-	rm $*.s
diff --git a/mpi/config.links b/mpi/config.links
index aaae6bca..a750dcd0 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -334,7 +334,7 @@ for fn in $mpi_required_modules ; do
 	rm -f $srcdir/mpi/$fn.[Sc]
 	if test -f $srcdir/mpi/$dir/$fn.S ; then
             echo "  \":$dir/$fn.S\"" >>./mpi/mod-source-info.h
-            mpi_ln_list="$mpi_ln_list mpi/$fn.S:mpi/$dir/$fn.S"
+            mpi_ln_list="$mpi_ln_list mpi/$fn-asm.S:mpi/$dir/$fn.S"
             eval mpi_mod_asm_${fnu}=yes
             mpi_mod_list="$mpi_mod_list $fn"
 	    break;