X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blobdiff_plain;f=cipher%2FMakefile.am;h=85b0a47dd296078ff3db5af68a54e29bbe83d4b3;hp=af6d8024bfc2f4c349d34d6423af019ed1c384e3;hb=65f759ae682fe34d9a416152876abcfaf6d3f187;hpb=080c9ca49f4d0b0aa07e00e1eb84bc39bf4c8562

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index af6d8024b..85b0a47dd 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -1,52 +1,40 @@
-## Process this file with automake to produce Makefile.in
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
+## Process this file with automake to produce Makefile.in
 
-INCLUDES =  -I$(top_srcdir)/include -I$(top_srcdir)/intl
+INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
 
 noinst_LIBRARIES = libcipher.a
 
-# The configure script greps the module names from the following lines.
-# You must also add all these names to EXTRA_PROGRAMS some lines below
-# and EXTRA_foo_SOURCES entries.
-# Hmmm is there a more easy way to do this?  (EXTRA_PROGRAMS
-# might also list programs which are not modules)
-# MODULES: rndunix rndlinux rndegd
-# MODULES: sha1 rmd160 md5 tiger
-EXTRA_PROGRAMS = rndunix rndlinux rndegd  \
-		 sha1 rmd160 md5 tiger
-
-EXTRA_rndlinux_SOURCES = rndlinux.c
-EXTRA_rndunix_SOURCES = rndunix.c
-EXTRA_rndegd_SOURCES = rndegd.c
-EXTRA_md5_SOURCES = md5.c
-EXTRA_rmd160_SOURCES = rmd160.c
-EXTRA_sha1_SOURCES = sha1.c
-EXTRA_tiger_SOURCES = tiger.c
-
-
-if ENABLE_GNUPG_EXTENSIONS
-pkglib_PROGRAMS  = @DYNAMIC_CIPHER_MODS@
-else
-pkglib_PROGRAMS  =
-endif
-
-
-DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@
-
 libcipher_a_SOURCES = cipher.c	\
 		 pubkey.c	\
 		 md.c		\
 		 dynload.c	\
-		 dynload.h	\
+		 bithelp.h	\
 		 des.c		\
-		 des.h		\
 		 twofish.c	\
 		 blowfish.c	\
-		 blowfish.h	\
 		 cast5.c	\
-		 cast5.h	\
+		 rijndael.c     \
 		 elgamal.c	\
 		 elgamal.h	\
+		 rsa.c rsa.h    \
 		 primegen.c	\
 		 random.h	\
 		 random.c	\
@@ -54,47 +42,18 @@ libcipher_a_SOURCES = cipher.c	\
 		 rmd.h		\
 		 dsa.h		\
 		 dsa.c		\
-		 g10c.c 	\
 		 smallprime.c	\
-		 construct.c
-
-# configure creates the constructor file
-BUILT_SOURCES = construct.c
-
-
-libcipher_a_DEPENDENCIES = @STATIC_CIPHER_OBJS@
-libcipher_a_LIBADD =	   @STATIC_CIPHER_OBJS@
-
-
-# If I remember it correct, automake 1.4 has a feature to set
-# fooFLAGS depending on the program.  So we should check it out.
-
-tiger: $(srcdir)/tiger.c
-	`echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o tiger $(srcdir)/tiger.c | \
-	    sed -e 's/-O[2-9]*/-O1/g' `
-
-tiger.o: $(srcdir)/tiger.c
-	`echo $(COMPILE) -c $(srcdir)/tiger.c | sed -e 's/-O[2-9]*/-O1/g' `
-
-#twofish: $(srcdir)/twofish.c
-#	 `echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o twofish $(srcdir)/twofish.c | \
-#	     sed -e 's/-O[0-9]*/  /g' `
-
-twofish: $(srcdir)/twofish.c
-	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o twofish $(srcdir)/twofish.c
-
-#twofish.o: $(srcdir)/twofish.c
-#	 `echo $(COMPILE) -c $(srcdir)/twofish.c | sed -e 's/-O[0-9]*/  /g' `
-
-
-rndunix: $(srcdir)/rndunix.c
-	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
-
-rndlinux: $(srcdir)/rndlinux.c
-	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndlinux $(srcdir)/rndlinux.c
-
-rndegd: $(srcdir)/rndegd.c
-	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c
-
-
-
+		 algorithms.h   \
+		 rndlinux.c	\
+		 rndunix.c 	\
+		 rndegd.c  	\
+		 rndw32.c  	\
+		 md5.c     	\
+		 rmd160.c  	\
+		 sha1.c         \
+		 sha256.c
+
+EXTRA_libcipher_a_SOURCES = idea-stub.c sha512.c
+
+libcipher_a_DEPENDENCIES = @IDEA_O@ @SHA512_O@
+libcipher_a_LIBADD = @IDEA_O@ @SHA512_O@