Fix the gendsa program and add it to the app list. The progs.h file is

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 4fac51faa304e349d5a30fc0bdc86baf32b89d5d..a225bd447061086fc022c4290868c33b6872baa2 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -1,5 +1,5 @@
 #
-# SSLeay/apps/Makefile.ssl
+#  apps/Makefile.ssl
 #
 
 DIR=           apps
@@ -25,18 +25,18 @@ DLIBSSL=../libssl.a
 LIBCRYPTO=-L.. -lcrypto
 LIBSSL=-L.. -lssl
 
-SSLEAY= ssleay
+PROGRAM= openssl
 
-SCRIPTS=CA.sh der_chop
+SCRIPTS=CA.sh CA.pl der_chop
 
-EXE= $(SSLEAY)
+EXE= $(PROGRAM)
 
-E_EXE= verify asn1pars req dgst dh enc gendh gendsa errstr ca crl \
+E_EXE= verify asn1pars req dgst dh enc gendh errstr ca crl \
        rsa dsa dsaparam \
-       x509 genrsa s_server s_client speed \
+       x509 genrsa gendsa s_server s_client speed \
        s_time version pkcs7 crl2pkcs7 sess_id ciphers
 
-PROGS= $(SSLEAY).c
+PROGS= $(PROGRAM).c
 
 A_OBJ=apps.o
 A_SRC=apps.c
@@ -44,18 +44,18 @@ S_OBJ=      s_cb.o s_socket.o
 S_SRC= s_cb.c s_socket.c
 
 E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o enc.o gendh.o errstr.o ca.o \
-       gendsa.o pkcs7.o crl2p7.o crl.o \
+       pkcs7.o crl2p7.o crl.o \
        rsa.o dsa.o dsaparam.o \
-       x509.o genrsa.o s_server.o s_client.o speed.o \
+       x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
        s_time.o $(A_OBJ) $(S_OBJ) version.o sess_id.o \
        ciphers.o
 
 #      pem_mail.o
 
 E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c \
-       gendsa.c pkcs7.c crl2p7.c crl.c \
+       pkcs7.c crl2p7.c crl.c \
        rsa.c dsa.c dsaparam.c \
-       x509.c genrsa.c s_server.c s_client.c speed.c \
+       x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
        s_time.c $(A_SRC) $(S_SRC) version.c sess_id.c \
        ciphers.c
 
@@ -86,18 +86,15 @@ sreq.o: req.c
 files:
        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
-install: mklinks
-       @for i in $(EXE) $(SCRIPTS) mklinks; \
+install:
+       @for i in $(EXE) $(SCRIPTS); \
        do  \
        (echo installing $$i; \
         cp $$i $(INSTALLTOP)/bin/$$i; \
         chmod 755 $(INSTALLTOP)/bin/$$i ); \
         done; \
-       cp ssleay.cnf $(INSTALLTOP)/lib
-       chmod 644 $(INSTALLTOP)/lib/ssleay.cnf
-       cd $(INSTALLTOP)/bin; \
-       /bin/sh ./mklinks; \
-       /bin/rm -f ./mklinks
+       cp openssl.cnf $(INSTALLTOP)/lib; \
+       chmod 644 $(INSTALLTOP)/lib/openssl.cnf
 
 tags:
        ctags $(SRC)
@@ -130,15 +127,12 @@ $(DLIBSSL):
 $(DLIBCRYPTO):
        (cd ../crypto; $(MAKE))
 
-$(SSLEAY): progs.h $(E_OBJ) $(SSLEAY).o $(DLIBCRYPTO) $(DLIBSSL)
-       $(RM) $(SSLEAY)
-       $(CC) -o $(SSLEAY) $(CFLAGS) $(SSLEAY).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
+       $(RM) $(PROGRAM)
+       $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
 
 progs.h:
-       perl ./g_ssleay.pl $(E_EXE) >progs.h
-       $(RM) $(SSLEAY).o
-
-mklinks:
-       perl ./g_ssleay.pl $(E_EXE) >progs.h
+       perl ./progs.pl $(E_EXE) >progs.h
+       $(RM) $(PROGRAM).o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.