summaryrefslogtreecommitdiffstats
path: root/mpi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-07-14 19:47:23 +0200
committerWerner Koch <wk@gnupg.org>1999-07-14 19:47:23 +0200
commit40f2d9f830fc86435e4d408689cb4168892d7d4c (patch)
treed7b35f48495dcdc673133011b96e18162928280d /mpi
parentSee ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch (diff)
downloadgnupg2-40f2d9f830fc86435e4d408689cb4168892d7d4c.tar.xz
gnupg2-40f2d9f830fc86435e4d408689cb4168892d7d4c.zip
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
Diffstat (limited to 'mpi')
-rw-r--r--mpi/ChangeLog5
-rw-r--r--mpi/Makefile.am23
2 files changed, 14 insertions, 14 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index cce6ee56d..460e08b26 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 19:42:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * Makefile.am: Use .s files as temporaries, disabled other .S rules.
+
Wed Jul 7 13:08:40 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index e5c241a2e..ef9816aa5 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,5 +1,6 @@
## Process this file with automake to produce Makefile.in
+
INCLUDES = -I$(top_srcdir)/include
CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
SFLAGS = @MPI_SFLAGS@
@@ -7,7 +8,8 @@ SFLAGS = @MPI_SFLAGS@
EXTRA_DIST = config.links
DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S \
mpih-lshift.S mpih-rshift.S mpih-sub1.S asm-syntax.h sysdep.h
-CLEANFILES = tmp-*.s
+# Note: we only use .S files so we should delete all left over .s
+CLEANFILES = *.s
noinst_LTLIBRARIES = libmpi.la
@@ -46,20 +48,13 @@ common_asm_objects = mpih-mul1.lo \
libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
-SUFFIXES = .S
-
+# cancel the default rules used by libtool which do not really
+# work and add one to cpp .S files
.S.o:
- $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
- $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
- mv tmp-$*.o $@
- rm -f tmp-$*.s
.S.lo:
- $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
- if test -f tmp-$*.lo; then rm tmp-$*.lo; fi
- if test -f tmp-$*.o ; then rm tmp-$*.o ; fi
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
- if test -f tmp-$*.lo; then mv tmp-$*.lo $*.lo; fi
- if test -f tmp-$*.o ; then mv tmp-$*.o $*.o ; fi
- rm -f tmp-$*.s
+
+.S.s:
+ $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >$*.s
+