From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 21 Sep 2006 13:07:57 +0000 (+0000)
Subject: Compile in gost engine.
X-Git-Tag: OpenSSL_0_9_8k^2~1133
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ffa5ebf3f4afe639bd2abbe367ca2c8557d9c866;p=oweals%2Fopenssl.git

Compile in gost engine.
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 86b2f9a1c3..36ec2ebbdb 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -98,6 +98,9 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_PADLOCK
 	ENGINE_load_padlock();
 #endif
+#ifndef OPENSSL_NO_GOST
+	ENGINE_load_gost();
+#endif
 #endif
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	ENGINE_load_cryptodev();
diff --git a/engines/Makefile b/engines/Makefile
index 4f1b458980..9bd9f42ff4 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -9,6 +9,12 @@ INCLUDES= -I../include
 CFLAG=-g
 MAKEFILE=	Makefile
 AR=		ar r
+EDIRS= ccgost
+
+RECURSIVE_MAKE=	[ -n "$(EDIRS)" ] && for i in $(EDIRS) ; do \
+		    (cd $$i && echo "making $$target in $(DIR)/$$i..." && \
+		    $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \
+		done;
 
 PEX_LIBS=
 EX_LIBS=
@@ -61,7 +67,7 @@ top:
 
 all:	lib
 
-lib:	$(LIBOBJ)
+lib:	$(LIBOBJ) subdirs
 	@if [ -n "$(SHARED_LIBS)" ]; then \
 		set -e; \
 		for l in $(LIBNAMES); do \
@@ -76,10 +82,16 @@ lib:	$(LIBOBJ)
 	fi; \
 	touch lib
 
+subdirs:
+	echo $(EDIRS)
+	@target=all; $(RECURSIVE_MAKE)
+
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+	@target=files; $(RECURSIVE_MAKE)
 
 links:
+	@target=links; $(RECURSIVE_MAKE)
 
 # XXXXX This currently only works on systems that use .so as suffix
 # for shared libraries as well as for Cygwin which uses the
@@ -107,6 +119,7 @@ install:
 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
 		done; \
 	fi
+	@target=install; $(RECURSIVE_MAKE)
 
 tags:
 	ctags $(SRC)
@@ -121,20 +134,23 @@ tests:
 
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
+	@target=lint; $(RECURSIVE_MAKE)
 
 depend:
 	@if [ -z "$(THIS)" ]; then \
 	    $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-	else \
-	    $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \
 	fi
+	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+	@[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	@target=dclean; $(RECURSIVE_MAKE)
 
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	@target=clean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.