From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 12 Oct 2011 17:27:08 +0000 (+0000)
Subject: Remove o_init.o special case from Makefile: this doesn't work.
X-Git-Tag: OpenSSL-fips-2_0-rc1~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7fc78f11e8f83cb57e096c3425d026963c24b43c;p=oweals%2Fopenssl.git

Remove o_init.o special case from Makefile: this doesn't work.
---

diff --git a/crypto/Makefile b/crypto/Makefile
index 1a882f02e9..22cb2a5013 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -88,23 +88,6 @@ pariscid.s:	pariscid.pl;	$(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:	alphacpuid.pl
 	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
-o_init.o: o_init.c
-	case "`(uname -s) 2>/dev/null`" in \
-	OSF1|IRIX*)	_WL_INIT="-Wl,-init,OPENSSL_init"	;; \
-	HP-UX)		_WL_INIT="-Wl,+init,OPENSSL_init"	;; \
-	AIX)		_WL_INIT="-Wl,-binitfini:OPENSSL_init,-bnoobjreorder";; \
-	Darwin)		(   while [ "x$1" != "x" -a "x$1" != "x-dynamiclib" ]; do shift; done; \
-			    [ $# -ge 1 ] \
-			) && _WL_INIT="-Wl,-init,_OPENSSL_init" ;; \
-	esac ; \
-	$(CC) $(CFLAGS) $(_WL_INIT) -c -o $@ $<
-
-testapps:
-	[ -z "$(THIS)" ] || (	if expr " $(SDIRS) " : ".* des " >/dev/null; \
-				then cd des && $(MAKE) -e des; fi )
-	[ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps );
-	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
 subdirs:
 	@target=all; $(RECURSIVE_MAKE)