See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch

7 files changed, 35 insertions, 33 deletions

diff --git a/README b/README
index 6dcfd41d..5de8defe 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
 			   Version 0.9.8
@@ -68,7 +66,7 @@
 
     3) "make install"
 
-    4) You end up with a "gpg" binray in /usr/local/bin.
+    4) You end up with a "gpg" binary in /usr/local/bin.
        Note: Because some programs rely on the existence of a
        binary named "gpgm"; you should install a symbolic link
        from gpgm to gpg:
@@ -447,12 +445,3 @@
 
     Have fun and remember: Echelon is looking at you kid.
 
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v0.9.7 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-iQB1AwUBN3SoBh0Z9MEMmFelAQE+9wL/bOTFEPvkO0drlWAu8k2P7udEzwfGlKhE
-Iyr6g75FSX4NnDkHB7RjyHYvQUkc8gicxYV8pBWe5c1bMYwrpe1cMvAu+BtUfDQc
-oHUbx9ln7CZ2BkEgzT5bjypugwtc6o7g
-=uTFn
------END PGP SIGNATURE-----
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26f83e32..c5bdf3c9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,17 +7,19 @@ man_MANS = gpg.1
 
 %.1 : %.sgml
 if HAVE_DOCBOOK_TO_MAN
-	  docbook-to-man $<  >$@
+	docbook-to-man $<  >$@
 else
-	  : Warning: missing docbook-to-man, cannot make $@
+	: Warning: missing docbook-to-man, cannot make $@
+	echo ".TH $< 1"   >$@
+	echo "No man page due to missing docbook-to-man" >>$@
 endif
 
 
 %.txt : %.sgml
-	 sgml2txt -c latin $*
+	sgml2txt -c latin $*
 
 %.html : %.sgml
-	 sgml2html -c latin $*
+	sgml2html -c latin $*
 
 %.dvi : %.sgml
 	-rm $*.sgml.tmp
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index cce6ee56..460e08b2 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 e5c241a2..ef9816aa 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
+
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 6f73e8cc..e611a022 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+
+	* ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3
+
 Mon Jul 12 14:55:34 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 57951266..d1f3af8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ libgcrypt_la_LIBADD = ../cipher/libcipher.la  \
 
 BUILT_SOURCES = libgcrypt.sym
 
-# libtool's --export-symbols-regex does not work in 1.3
+# libtool's --export-symbols-regex does not work in 1.3.2
 # so we do it ourself
 libgcrypt.sym: $(libgcrypt_la_OBJECTS)
 	    $(NM) $(libgcrypt_la_OBJECTS) \
diff --git a/src/pkapi.c b/src/pkapi.c
index 8457ef12..7d48c4c9 100644
--- a/src/pkapi.c
+++ b/src/pkapi.c
@@ -35,11 +35,15 @@
 int
 gcry_pk_encrypt( GCRY_SEXP *result, GCRY_SEXP data, GCRY_SEXP pkey )
 {
+	/* ... */
+    return 0;
 }
 
 int
 gcry_pk_decrypt( GCRY_SEXP *result, GCRY_SEXP data, GCRY_SEXP skey )
 {
+	/* ... */
+    return 0;
 }
 
 int
@@ -50,12 +54,14 @@ gcry_pk_sign( GCRY_SEXP *result, GCRY_SEXP data, GCRY_SEXP skey )
     s = gcry_sexp_find_token( skey, "private-key", 0 );
     if( !s )
 	return -1; /* no private key */
-    ...
-
+	/* ... */
+    return 0;
 }
 
 int
 gcry_pk_verify( GCRY_SEXP *result, GCRY_SEXP data, GCRY_SEXP pkey )
 {
+	/* ... */
+    return 0;
 }