diff options
author | Marcus Brinkmann <mb@g10code.com> | 2007-05-09 18:13:31 +0000 |
---|---|---|
committer | Marcus Brinkmann <mb@g10code.com> | 2007-05-09 18:13:31 +0000 |
commit | fba3b80f165aefb05e117fd78a4bca05625f344d (patch) | |
tree | a6b946d0203577efffced55ebed900c2e6c779a1 /mpi/Makefile.am | |
parent | 602a5881840628b91183e44102603f9581d7aca1 (diff) | |
download | libgcrypt-fba3b80f165aefb05e117fd78a4bca05625f344d.tar.gz |
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.
Diffstat (limited to 'mpi/Makefile.am')
-rw-r--r-- | mpi/Makefile.am | 223 |
1 files changed, 97 insertions, 126 deletions
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 |