1 files changed, 21 insertions, 24 deletions

diff --git a/src/lib/libssl/src/crypto/rijndael/Makefile.ssl b/src/lib/libcrypto/stack/Makefile
index 79ffd7598b..711b16832a 100644
--- a/src/lib/libssl/src/crypto/rijndael/Makefile.ssl
+++ b/src/lib/libcrypto/stack/Makefile
@@ -1,27 +1,20 @@
 #
-# crypto/rijndael/Makefile
+# OpenSSL/crypto/stack/Makefile
 #
 
-DIR=    rijndael
+DIR=    stack
 TOP=    ../..
 CC=     cc
-CPP=    $(CC) -E
 INCLUDES=
 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKE=           make -f Makefile.ssl
 MAKEDEPPROG=    makedepend
 MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile.ssl
+MAKEFILE=       Makefile
 AR=             ar r
 
-RD_ENC=         rd_enc.o
-# or use
-#DES_ENC=       bx86-elf.o
-
-# CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
@@ -29,12 +22,15 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=rd_fst.c
-LIBOBJ=rd_fst.o
+LIBSRC=stack.c
+LIBOBJ=stack.o
 
 SRC= $(LIBSRC)
 
-EXHEADER=rd_fst.h rijndael.h
+EXHEADER= stack.h safestack.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
 
 top:
         (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
@@ -43,24 +39,19 @@ all:	lib
 
 lib:    $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB)
+        $(RANLIB) $(LIB) || echo Never mind.
         @touch lib
 
-$(LIBOBJ): $(LIBSRC)
-
 files:
-        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 links:
-        @$(TOP)/util/point.sh Makefile.ssl Makefile
         @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
         @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
         @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
-install: installs
-
-installs:
-        @for i in $(EXHEADER) ; \
+install:
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
         do  \
         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
@@ -75,7 +66,7 @@ lint:
         lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-        $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
         $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -86,4 +77,10 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rd_fst.o: rd_fst.c rd_fst.h
+stack.o: ../../e_os.h ../../include/openssl/bio.h
+stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+stack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+stack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+stack.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+stack.o: ../cryptlib.h stack.c