From 42ba5d2329a2705d45417db3dd374c677eb47e05 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Wed, 30 Mar 2005 13:05:57 +0000 Subject: [PATCH] Blow away Makefile.ssl. --- Configure | 4 ++-- Makefile.org | 15 +++++++-------- apps/{Makefile.ssl => Makefile} | 9 ++++----- config | 2 ++ crypto/{Makefile.ssl => Makefile} | 12 +++++------- crypto/aes/{Makefile.ssl => Makefile} | 7 +++---- crypto/asn1/{Makefile.ssl => Makefile} | 7 +++---- crypto/bf/{Makefile.ssl => Makefile} | 7 +++---- crypto/bio/{Makefile.ssl => Makefile} | 7 +++---- crypto/bn/{Makefile.ssl => Makefile} | 7 +++---- crypto/buffer/{Makefile.ssl => Makefile} | 7 +++---- crypto/cast/{Makefile.ssl => Makefile} | 7 +++---- crypto/comp/{Makefile.ssl => Makefile} | 7 +++---- crypto/conf/{Makefile.ssl => Makefile} | 7 +++---- crypto/des/{Makefile.ssl => Makefile} | 7 +++---- crypto/dh/{Makefile.ssl => Makefile} | 7 +++---- crypto/dsa/{Makefile.ssl => Makefile} | 7 +++---- crypto/dso/{Makefile.ssl => Makefile} | 7 +++---- crypto/ec/{Makefile.ssl => Makefile} | 7 +++---- crypto/ecdh/{Makefile.ssl => Makefile} | 7 +++---- crypto/ecdsa/{Makefile.ssl => Makefile} | 7 +++---- crypto/engine/{Makefile.ssl => Makefile} | 7 +++---- crypto/err/{Makefile.ssl => Makefile} | 7 +++---- crypto/evp/{Makefile.ssl => Makefile} | 7 +++---- crypto/hmac/{Makefile.ssl => Makefile} | 7 +++---- crypto/idea/{Makefile.ssl => Makefile} | 7 +++---- crypto/krb5/{Makefile.ssl => Makefile} | 9 ++++----- crypto/lhash/{Makefile.ssl => Makefile} | 7 +++---- crypto/md2/{Makefile.ssl => Makefile} | 7 +++---- crypto/md4/{Makefile.ssl => Makefile} | 7 +++---- crypto/md5/{Makefile.ssl => Makefile} | 7 +++---- crypto/mdc2/{Makefile.ssl => Makefile} | 7 +++---- crypto/objects/{Makefile.ssl => Makefile} | 7 +++---- crypto/ocsp/{Makefile.ssl => Makefile} | 9 ++++----- crypto/pem/{Makefile.ssl => Makefile} | 7 +++---- crypto/pkcs12/{Makefile.ssl => Makefile} | 7 +++---- crypto/pkcs7/{Makefile.ssl => Makefile} | 7 +++---- crypto/rand/{Makefile.ssl => Makefile} | 7 +++---- crypto/rc2/{Makefile.ssl => Makefile} | 7 +++---- crypto/rc4/{Makefile.ssl => Makefile} | 7 +++---- crypto/rc5/{Makefile.ssl => Makefile} | 7 +++---- crypto/ripemd/{Makefile.ssl => Makefile} | 7 +++---- crypto/rsa/{Makefile.ssl => Makefile} | 7 +++---- crypto/sha/{Makefile.ssl => Makefile} | 7 +++---- crypto/stack/{Makefile.ssl => Makefile} | 7 +++---- crypto/store/{Makefile.ssl => Makefile} | 7 +++---- crypto/txt_db/{Makefile.ssl => Makefile} | 7 +++---- crypto/ui/{Makefile.ssl => Makefile} | 7 +++---- crypto/x509/{Makefile.ssl => Makefile} | 5 ++--- crypto/x509v3/{Makefile.ssl => Makefile} | 7 +++---- engines/{Makefile.ssl => Makefile} | 7 +++---- ssl/{Makefile.ssl => Makefile} | 7 +++---- test/{Makefile.ssl => Makefile} | 13 ++++++------- tools/{Makefile.ssl => Makefile} | 9 ++++----- 54 files changed, 172 insertions(+), 223 deletions(-) rename apps/{Makefile.ssl => Makefile} (99%) rename crypto/{Makefile.ssl => Makefile} (96%) rename crypto/aes/{Makefile.ssl => Makefile} (95%) rename crypto/asn1/{Makefile.ssl => Makefile} (99%) rename crypto/bf/{Makefile.ssl => Makefile} (94%) rename crypto/bio/{Makefile.ssl => Makefile} (98%) rename crypto/bn/{Makefile.ssl => Makefile} (99%) rename crypto/buffer/{Makefile.ssl => Makefile} (93%) rename crypto/cast/{Makefile.ssl => Makefile} (94%) rename crypto/comp/{Makefile.ssl => Makefile} (95%) rename crypto/conf/{Makefile.ssl => Makefile} (97%) rename crypto/des/{Makefile.ssl => Makefile} (98%) rename crypto/dh/{Makefile.ssl => Makefile} (97%) rename crypto/dsa/{Makefile.ssl => Makefile} (97%) rename crypto/dso/{Makefile.ssl => Makefile} (97%) rename crypto/ec/{Makefile.ssl => Makefile} (98%) rename crypto/ecdh/{Makefile.ssl => Makefile} (97%) rename crypto/ecdsa/{Makefile.ssl => Makefile} (97%) rename crypto/engine/{Makefile.ssl => Makefile} (99%) rename crypto/err/{Makefile.ssl => Makefile} (95%) rename crypto/evp/{Makefile.ssl => Makefile} (99%) rename crypto/hmac/{Makefile.ssl => Makefile} (92%) rename crypto/idea/{Makefile.ssl => Makefile} (92%) rename crypto/krb5/{Makefile.ssl => Makefile} (91%) rename crypto/lhash/{Makefile.ssl => Makefile} (93%) rename crypto/md2/{Makefile.ssl => Makefile} (93%) rename crypto/md4/{Makefile.ssl => Makefile} (92%) rename crypto/md5/{Makefile.ssl => Makefile} (94%) rename crypto/mdc2/{Makefile.ssl => Makefile} (94%) rename crypto/objects/{Makefile.ssl => Makefile} (96%) rename crypto/ocsp/{Makefile.ssl => Makefile} (98%) rename crypto/pem/{Makefile.ssl => Makefile} (98%) rename crypto/pkcs12/{Makefile.ssl => Makefile} (99%) rename crypto/pkcs7/{Makefile.ssl => Makefile} (98%) rename crypto/rand/{Makefile.ssl => Makefile} (97%) rename crypto/rc2/{Makefile.ssl => Makefile} (93%) rename crypto/rc4/{Makefile.ssl => Makefile} (95%) rename crypto/rc5/{Makefile.ssl => Makefile} (94%) rename crypto/ripemd/{Makefile.ssl => Makefile} (93%) rename crypto/rsa/{Makefile.ssl => Makefile} (98%) rename crypto/sha/{Makefile.ssl => Makefile} (96%) rename crypto/stack/{Makefile.ssl => Makefile} (92%) rename crypto/store/{Makefile.ssl => Makefile} (96%) rename crypto/txt_db/{Makefile.ssl => Makefile} (92%) rename crypto/ui/{Makefile.ssl => Makefile} (96%) rename crypto/x509/{Makefile.ssl => Makefile} (99%) rename crypto/x509v3/{Makefile.ssl => Makefile} (99%) rename engines/{Makefile.ssl => Makefile} (98%) rename ssl/{Makefile.ssl => Makefile} (99%) rename test/{Makefile.ssl => Makefile} (99%) rename tools/{Makefile.ssl => Makefile} (86%) diff --git a/Configure b/Configure index 239ae105fa..7c91ef5e0b 100755 --- a/Configure +++ b/Configure @@ -572,7 +572,7 @@ my $no_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used my $no_asm=0; my $no_dso=0; my @skip=(); -my $Makefile="Makefile.ssl"; +my $Makefile="Makefile"; my $des_locl="crypto/des/des_locl.h"; my $des ="crypto/des/des.h"; my $bn ="crypto/bn/bn.h"; @@ -1534,7 +1534,7 @@ if($IsMK1MF) { EOF close(OUT); } else { - my $make_command = "make -f Makefile.ssl PERL=\'$perl\'"; + my $make_command = "make PERL=\'$perl\'"; my $make_targets = ""; $make_targets .= " links" if $symlink; $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; diff --git a/Makefile.org b/Makefile.org index d47d3b937d..6b580d6ab6 100644 --- a/Makefile.org +++ b/Makefile.org @@ -117,9 +117,9 @@ SDIRS= \ # should be performed. TESTS = alltests -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile NEWMAKE= make -MAKE= $(NEWMAKE) -f Makefile.ssl +MAKE= $(NEWMAKE) MANDIR=$(OPENSSLDIR)/man MAN1=1 @@ -146,7 +146,7 @@ WTARFILE= $(NAME)-win.tar EXHEADER= e_os2.h HEADER= e_os.h -all: Makefile.ssl build_all openssl.pc +all: Makefile build_all openssl.pc BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' \ @@ -253,7 +253,7 @@ do_$(SHLIB_TARGET): libs="-l$$i $$libs"; \ done -openssl.pc: Makefile.ssl +openssl.pc: Makefile @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ echo 'libdir=$${exec_prefix}/lib'; \ @@ -266,8 +266,8 @@ openssl.pc: Makefile.ssl echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc -Makefile.ssl: Makefile.org - @echo "Makefile.ssl is older than Makefile.org." +Makefile: Makefile.org + @echo "Makefile is older than Makefile.org." @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." @false @@ -297,7 +297,7 @@ makefile.one: files sh util/do_ms.sh files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO @set -e; for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -307,7 +307,6 @@ files: done; links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) @set -e; target=links; for dir in $(DIRS); do $(BUILD_CMD); done diff --git a/apps/Makefile.ssl b/apps/Makefile similarity index 99% rename from apps/Makefile.ssl rename to apps/Makefile index c0efd47eb2..671944bb2c 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile @@ -1,5 +1,5 @@ # -# apps/Makefile.ssl +# apps/Makefile # DIR= apps @@ -11,10 +11,10 @@ INSTALL_PREFIX= INSTALLTOP= /usr/local/ssl OPENSSLDIR= /usr/local/ssl NEWMAKE= make -MAKE= $(NEWMAKE) -f Makefile.ssl +MAKE= $(NEWMAKE) MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile PERL= perl RM= rm -f # KRB5 stuff @@ -105,7 +105,7 @@ sreq.o: req.c $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO install: @set -e; for i in $(EXE); \ @@ -132,7 +132,6 @@ tags: tests: links: - @sh $(TOP)/util/point.sh Makefile.ssl Makefile lint: lint -DLINT $(INCLUDES) $(SRC)>fluff diff --git a/config b/config index 711af61541..e7cc768a79 100755 --- a/config +++ b/config @@ -20,6 +20,8 @@ # Be as similar to the output of config.guess/config.sub # as possible. +set -x + PREFIX="" SUFFIX="" TEST="false" diff --git a/crypto/Makefile.ssl b/crypto/Makefile similarity index 96% rename from crypto/Makefile.ssl rename to crypto/Makefile index bb9df4a642..c7ce69d6a4 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile @@ -11,10 +11,10 @@ CFLAG= -g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP= /usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile RM= rm -f AR= ar r @@ -55,9 +55,9 @@ top: all: shared -buildinf.h: ../Makefile.ssl +buildinf.h: ../Makefile ( echo "#ifndef MK1MF_BUILD"; \ - echo ' /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \ + echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ echo ' #define PLATFORM "$(PLATFORM)"'; \ echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ @@ -89,7 +89,7 @@ subdirs: done; files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making 'files' in crypto/$$i..." && \ @@ -97,11 +97,9 @@ files: done; links: - @sh $(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) - @sh $(TOP)/util/point.sh Makefile.ssl Makefile @for i in $(SDIRS); do \ (cd $$i && echo "making links in crypto/$$i..." && \ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \ diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile similarity index 95% rename from crypto/aes/Makefile.ssl rename to crypto/aes/Makefile index 7f7f141b44..bdd11b33a2 100644 --- a/crypto/aes/Makefile.ssl +++ b/crypto/aes/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP= /usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r AES_ASM_OBJ=aes_core.o aes_cbc.o @@ -62,10 +62,9 @@ ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile similarity index 99% rename from crypto/asn1/Makefile.ssl rename to crypto/asn1/Makefile index 18cf975dca..b877e5cc1f 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -74,10 +74,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile similarity index 94% rename from crypto/bf/Makefile.ssl rename to crypto/bf/Makefile index 89894dd035..778d9084e4 100644 --- a/crypto/bf/Makefile.ssl +++ b/crypto/bf/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r BF_ENC= bf_enc.o @@ -61,10 +61,9 @@ bx86-out.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl (cd asm; $(PERL) bf-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile similarity index 98% rename from crypto/bio/Makefile.ssl rename to crypto/bio/Makefile index 85be2ed010..976c5cd646 100644 --- a/crypto/bio/Makefile.ssl +++ b/crypto/bio/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -54,10 +54,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile similarity index 99% rename from crypto/bn/Makefile.ssl rename to crypto/bn/Makefile index 817bfa54cd..75437cdbcc 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r BN_ASM= bn_asm.o @@ -108,10 +108,9 @@ aix_ppc64.s: asm/ppc.pl; $(PERL) asm/ppc.pl $@ osx_ppc32.s: asm/ppc.pl; $(PERL) $< $@ files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile similarity index 93% rename from crypto/buffer/Makefile.ssl rename to crypto/buffer/Makefile index 25facaeb05..d80e361dc2 100644 --- a/crypto/buffer/Makefile.ssl +++ b/crypto/buffer/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile similarity index 94% rename from crypto/cast/Makefile.ssl rename to crypto/cast/Makefile index 5ff5b7a715..03f9b411d5 100644 --- a/crypto/cast/Makefile.ssl +++ b/crypto/cast/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CAST_ENC=c_enc.o @@ -59,10 +59,9 @@ cx86-out.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl (cd asm; $(PERL) cast-586.pl a.out $(CLAGS) $(PROCESSOR) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile similarity index 95% rename from crypto/comp/Makefile.ssl rename to crypto/comp/Makefile index c2950086ce..41369ab06c 100644 --- a/crypto/comp/Makefile.ssl +++ b/crypto/comp/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +47,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile similarity index 97% rename from crypto/conf/Makefile.ssl rename to crypto/conf/Makefile index e752678e49..1c039081d0 100644 --- a/crypto/conf/Makefile.ssl +++ b/crypto/conf/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +47,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile similarity index 98% rename from crypto/des/Makefile.ssl rename to crypto/des/Makefile index a0c1baa8ab..82a3f6be13 100644 --- a/crypto/des/Makefile.ssl +++ b/crypto/des/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r RANLIB= ranlib DES_ENC= des_enc.o fcrypt_b.o @@ -87,10 +87,9 @@ yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl (cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile similarity index 97% rename from crypto/dh/Makefile.ssl rename to crypto/dh/Makefile index fe5c3f4ae5..121b7a7a3b 100644 --- a/crypto/dh/Makefile.ssl +++ b/crypto/dh/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile similarity index 97% rename from crypto/dsa/Makefile.ssl rename to crypto/dsa/Makefile index 0ce7445cb9..c4cac81ba6 100644 --- a/crypto/dsa/Makefile.ssl +++ b/crypto/dsa/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -46,10 +46,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/dso/Makefile.ssl b/crypto/dso/Makefile similarity index 97% rename from crypto/dso/Makefile.ssl rename to crypto/dso/Makefile index 7478f4c532..028da8df50 100644 --- a/crypto/dso/Makefile.ssl +++ b/crypto/dso/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -46,10 +46,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/ec/Makefile.ssl b/crypto/ec/Makefile similarity index 98% rename from crypto/ec/Makefile.ssl rename to crypto/ec/Makefile index f0bb149ae6..5f708da15f 100644 --- a/crypto/ec/Makefile.ssl +++ b/crypto/ec/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -49,10 +49,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/ecdh/Makefile.ssl b/crypto/ecdh/Makefile similarity index 97% rename from crypto/ecdh/Makefile.ssl rename to crypto/ecdh/Makefile index 7e1dfefd85..17d8883eba 100644 --- a/crypto/ecdh/Makefile.ssl +++ b/crypto/ecdh/Makefile @@ -10,10 +10,10 @@ CFLAG=-g -Wall INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -45,10 +45,9 @@ lib: $(LIBOBJ) @touch lib 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) diff --git a/crypto/ecdsa/Makefile.ssl b/crypto/ecdsa/Makefile similarity index 97% rename from crypto/ecdsa/Makefile.ssl rename to crypto/ecdsa/Makefile index e096a0a90e..f63dc2e578 100644 --- a/crypto/ecdsa/Makefile.ssl +++ b/crypto/ecdsa/Makefile @@ -10,10 +10,10 @@ CFLAG=-g -Wall INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -45,10 +45,9 @@ lib: $(LIBOBJ) @touch lib 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) diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile similarity index 99% rename from crypto/engine/Makefile.ssl rename to crypto/engine/Makefile index f75297fd0c..af96d18910 100644 --- a/crypto/engine/Makefile.ssl +++ b/crypto/engine/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -52,10 +52,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile similarity index 95% rename from crypto/err/Makefile.ssl rename to crypto/err/Makefile index 5630819423..e8bbc783b1 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile similarity index 99% rename from crypto/evp/Makefile.ssl rename to crypto/evp/Makefile index 4a38c03de9..e8671236de 100644 --- a/crypto/evp/Makefile.ssl +++ b/crypto/evp/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -66,10 +66,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) cp $(TESTDATA) ../../test diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile similarity index 92% rename from crypto/hmac/Makefile.ssl rename to crypto/hmac/Makefile index 6b6d9c3ba9..aade0cf4ac 100644 --- a/crypto/hmac/Makefile.ssl +++ b/crypto/hmac/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/idea/Makefile.ssl b/crypto/idea/Makefile similarity index 92% rename from crypto/idea/Makefile.ssl rename to crypto/idea/Makefile index 4ceb095151..f6511467f0 100644 --- a/crypto/idea/Makefile.ssl +++ b/crypto/idea/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/krb5/Makefile.ssl b/crypto/krb5/Makefile similarity index 91% rename from crypto/krb5/Makefile.ssl rename to crypto/krb5/Makefile index 98be630fb6..2f943ef374 100644 --- a/crypto/krb5/Makefile.ssl +++ b/crypto/krb5/Makefile @@ -1,5 +1,5 @@ # -# OpenSSL/krb5/Makefile.ssl +# OpenSSL/krb5/Makefile # DIR= krb5 @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -45,10 +45,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile similarity index 93% rename from crypto/lhash/Makefile.ssl rename to crypto/lhash/Makefile index 426cdb25a2..152072439c 100644 --- a/crypto/lhash/Makefile.ssl +++ b/crypto/lhash/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile similarity index 93% rename from crypto/md2/Makefile.ssl rename to crypto/md2/Makefile index 213ed2932c..c92c25efa5 100644 --- a/crypto/md2/Makefile.ssl +++ b/crypto/md2/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/md4/Makefile.ssl b/crypto/md4/Makefile similarity index 92% rename from crypto/md4/Makefile.ssl rename to crypto/md4/Makefile index d1eb9519f9..1ad7cd1ab7 100644 --- a/crypto/md4/Makefile.ssl +++ b/crypto/md4/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -45,10 +45,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile similarity index 94% rename from crypto/md5/Makefile.ssl rename to crypto/md5/Makefile index 5d1a29f6ab..86f0f85422 100644 --- a/crypto/md5/Makefile.ssl +++ b/crypto/md5/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r MD5_ASM_OBJ= @@ -77,10 +77,9 @@ md5-sparcv9.o: asm/md5-sparcv9.S -o md5-sparcv9.o asm/md5-sparcv9.S files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile similarity index 94% rename from crypto/mdc2/Makefile.ssl rename to crypto/mdc2/Makefile index 8ce78cac5c..a51e868f14 100644 --- a/crypto/mdc2/Makefile.ssl +++ b/crypto/mdc2/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile similarity index 96% rename from crypto/objects/Makefile.ssl rename to crypto/objects/Makefile index 3f01f9df6d..f332d694eb 100644 --- a/crypto/objects/Makefile.ssl +++ b/crypto/objects/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r PERL= perl @@ -53,10 +53,9 @@ obj_mac.h: objects.pl objects.txt obj_mac.num @sleep 1; touch obj_mac.h; sleep 1 files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/ocsp/Makefile.ssl b/crypto/ocsp/Makefile similarity index 98% rename from crypto/ocsp/Makefile.ssl rename to crypto/ocsp/Makefile index c4f50af842..af60c0119d 100644 --- a/crypto/ocsp/Makefile.ssl +++ b/crypto/ocsp/Makefile @@ -1,5 +1,5 @@ # -# OpenSSL/ocsp/Makefile.ssl +# OpenSSL/ocsp/Makefile # DIR= ocsp @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +47,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile similarity index 98% rename from crypto/pem/Makefile.ssl rename to crypto/pem/Makefile index 02156ef659..2f15126b89 100644 --- a/crypto/pem/Makefile.ssl +++ b/crypto/pem/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +47,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: $(EXHEADER) - @sh $(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) diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile similarity index 99% rename from crypto/pkcs12/Makefile.ssl rename to crypto/pkcs12/Makefile index 13860527ab..a2c366afd4 100644 --- a/crypto/pkcs12/Makefile.ssl +++ b/crypto/pkcs12/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -50,10 +50,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile similarity index 98% rename from crypto/pkcs7/Makefile.ssl rename to crypto/pkcs7/Makefile index f8161ecb24..f7a262808a 100644 --- a/crypto/pkcs7/Makefile.ssl +++ b/crypto/pkcs7/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r PEX_LIBS= @@ -65,10 +65,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile similarity index 97% rename from crypto/rand/Makefile.ssl rename to crypto/rand/Makefile index e5da96e865..7c34f28a83 100644 --- a/crypto/rand/Makefile.ssl +++ b/crypto/rand/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -46,10 +46,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/rc2/Makefile.ssl b/crypto/rc2/Makefile similarity index 93% rename from crypto/rc2/Makefile.ssl rename to crypto/rc2/Makefile index 2a036d3037..c284847d1f 100644 --- a/crypto/rc2/Makefile.ssl +++ b/crypto/rc2/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile similarity index 95% rename from crypto/rc4/Makefile.ssl rename to crypto/rc4/Makefile index 7e98de885a..91fb3ac803 100644 --- a/crypto/rc4/Makefile.ssl +++ b/crypto/rc4/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r RC4_ENC=rc4_enc.o @@ -64,10 +64,9 @@ rc4-ia64.s: asm/rc4-ia64.S $(CC) $(CFLAGS) -E asm/rc4-ia64.S > $@ files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile similarity index 94% rename from crypto/rc5/Makefile.ssl rename to crypto/rc5/Makefile index e5d2b2b462..031ecd7464 100644 --- a/crypto/rc5/Makefile.ssl +++ b/crypto/rc5/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r RC5_ENC= rc5_enc.o @@ -61,10 +61,9 @@ r586-out.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl (cd asm; $(PERL) rc5-586.pl a.out $(CFLAGS) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile similarity index 93% rename from crypto/ripemd/Makefile.ssl rename to crypto/ripemd/Makefile index 051695cd19..dcfc506fa0 100644 --- a/crypto/ripemd/Makefile.ssl +++ b/crypto/ripemd/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r RIP_ASM_OBJ= @@ -59,10 +59,9 @@ rm86-out.s: asm/rmd-586.pl ../perlasm/x86asm.pl (cd asm; $(PERL) rmd-586.pl a.out $(CFLAGS) > ../$@) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile similarity index 98% rename from crypto/rsa/Makefile.ssl rename to crypto/rsa/Makefile index 3619331644..b12bf3fe1e 100644 --- a/crypto/rsa/Makefile.ssl +++ b/crypto/rsa/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -48,10 +48,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile similarity index 96% rename from crypto/sha/Makefile.ssl rename to crypto/sha/Makefile index 71adb3c38c..2c8159c333 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile @@ -11,10 +11,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r SHA1_ASM_OBJ= @@ -72,10 +72,9 @@ sha512-ia64.s: asm/sha512-ia64.pl (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS)) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/stack/Makefile.ssl b/crypto/stack/Makefile similarity index 92% rename from crypto/stack/Makefile.ssl rename to crypto/stack/Makefile index abf384a39d..55a031d284 100644 --- a/crypto/stack/Makefile.ssl +++ b/crypto/stack/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/store/Makefile.ssl b/crypto/store/Makefile similarity index 96% rename from crypto/store/Makefile.ssl rename to crypto/store/Makefile index 29900878c2..de50de88f4 100644 --- a/crypto/store/Makefile.ssl +++ b/crypto/store/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -46,10 +46,9 @@ lib: $(LIBOBJ) @touch lib 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) diff --git a/crypto/txt_db/Makefile.ssl b/crypto/txt_db/Makefile similarity index 92% rename from crypto/txt_db/Makefile.ssl rename to crypto/txt_db/Makefile index 57b5dea702..cdbeb0780f 100644 --- a/crypto/txt_db/Makefile.ssl +++ b/crypto/txt_db/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -44,10 +44,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/ui/Makefile.ssl b/crypto/ui/Makefile similarity index 96% rename from crypto/ui/Makefile.ssl rename to crypto/ui/Makefile index 9906d721b3..c4f200a08b 100644 --- a/crypto/ui/Makefile.ssl +++ b/crypto/ui/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -48,10 +48,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile similarity index 99% rename from crypto/x509/Makefile.ssl rename to crypto/x509/Makefile index e9293a8484..59684330b9 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -57,7 +57,6 @@ files: $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: - @sh $(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) diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile similarity index 99% rename from crypto/x509v3/Makefile.ssl rename to crypto/x509v3/Makefile index f91301188c..e2ae7e7740 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -52,10 +52,9 @@ lib: $(LIBOBJ) @touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/engines/Makefile.ssl b/engines/Makefile similarity index 98% rename from engines/Makefile.ssl rename to engines/Makefile index 8ae81f33ce..190dca74ae 100644 --- a/engines/Makefile.ssl +++ b/engines/Makefile @@ -11,10 +11,10 @@ INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl NEWMAKE= make -MAKE= $(NEWMAKE) -f Makefile.ssl +MAKE= $(NEWMAKE) MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r PEX_LIBS= @@ -87,10 +87,9 @@ lib: $(LIBOBJ) touch lib 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 # XXXXX This currently only works on systems that use .so as suffix # for shared libraries. diff --git a/ssl/Makefile.ssl b/ssl/Makefile similarity index 99% rename from ssl/Makefile.ssl rename to ssl/Makefile index c0f7e347a9..20e5bccd42 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile @@ -10,10 +10,10 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make -f Makefile MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r # KRB5 stuff KRB5_INCLUDES= @@ -68,10 +68,9 @@ shared: lib fi files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(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) diff --git a/test/Makefile.ssl b/test/Makefile similarity index 99% rename from test/Makefile.ssl rename to test/Makefile index 394d77899f..9fd937aabf 100644 --- a/test/Makefile.ssl +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# test/Makefile.ssl +# test/Makefile # DIR= test @@ -10,9 +10,9 @@ CFLAG= -g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP= /usr/local/ssl -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile NEWMAKE= make -MAKE= $(NEWMAKE) -f $(MAKEFILE) +MAKE= $(NEWMAKE) MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) PERL= perl @@ -25,7 +25,7 @@ EX_LIBS= #-lnsl -lsocket CFLAGS= $(INCLUDES) $(CFLAG) -GENERAL=Makefile.ssl maketests.com \ +GENERAL=Makefile maketests.com \ tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \ tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \ testca.com VMSca-response.1 VMSca-response.2 @@ -110,10 +110,9 @@ all: exe exe: $(EXE) dummytest$(EXE_EXT) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(TOP)/util/point.sh Makefile.ssl Makefile generate: $(SRC) $(SRC): @@ -283,7 +282,7 @@ test_ca: else \ echo "Generate and certify a test certificate via the 'ca' program"; \ sh ./testca; \ - fi + fi test_aes: #$(AESTEST) # @echo "test Rijndael" diff --git a/tools/Makefile.ssl b/tools/Makefile similarity index 86% rename from tools/Makefile.ssl rename to tools/Makefile index cb33d4a41e..c0770b3cbc 100644 --- a/tools/Makefile.ssl +++ b/tools/Makefile @@ -10,14 +10,14 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl +MAKE= make MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile CFLAGS= $(INCLUDES) $(CFLAG) -GENERAL=Makefile.ssl +GENERAL=Makefile TEST= APPS= c_rehash MISC_APPS= c_hash c_info c_issuer c_name @@ -39,10 +39,9 @@ install: done; files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @sh $(TOP)/util/point.sh Makefile.ssl Makefile lint: -- 2.25.1