diff options
author | Ben Laurie <ben@openssl.org> | 2005-03-30 13:05:57 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2005-03-30 13:05:57 +0000 |
commit | 42ba5d2329a2705d45417db3dd374c677eb47e05 (patch) | |
tree | 3348ff85620371c5c104e3a325b9c3731a9fc782 | |
parent | c3e6402857a60f61cac60d56793e8a8b79cebe90 (diff) |
Blow away Makefile.ssl.
-rwxr-xr-x | Configure | 4 | ||||
-rw-r--r-- | Makefile.org | 15 | ||||
-rw-r--r-- | apps/Makefile (renamed from apps/Makefile.ssl) | 9 | ||||
-rwxr-xr-x | config | 2 | ||||
-rw-r--r-- | crypto/Makefile (renamed from crypto/Makefile.ssl) | 12 | ||||
-rw-r--r-- | crypto/aes/Makefile (renamed from crypto/aes/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/asn1/Makefile (renamed from crypto/asn1/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/bf/Makefile (renamed from crypto/bf/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/bio/Makefile (renamed from crypto/bio/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/bn/Makefile (renamed from crypto/bn/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/buffer/Makefile (renamed from crypto/buffer/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/cast/Makefile (renamed from crypto/cast/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/comp/Makefile (renamed from crypto/comp/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/conf/Makefile (renamed from crypto/conf/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/des/Makefile (renamed from crypto/des/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/dh/Makefile (renamed from crypto/dh/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/dsa/Makefile (renamed from crypto/dsa/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/dso/Makefile (renamed from crypto/dso/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ec/Makefile (renamed from crypto/ec/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ecdh/Makefile (renamed from crypto/ecdh/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ecdsa/Makefile (renamed from crypto/ecdsa/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/engine/Makefile (renamed from crypto/engine/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/err/Makefile (renamed from crypto/err/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/evp/Makefile (renamed from crypto/evp/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/hmac/Makefile (renamed from crypto/hmac/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/idea/Makefile (renamed from crypto/idea/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/krb5/Makefile (renamed from crypto/krb5/Makefile.ssl) | 9 | ||||
-rw-r--r-- | crypto/lhash/Makefile (renamed from crypto/lhash/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/md2/Makefile (renamed from crypto/md2/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/md4/Makefile (renamed from crypto/md4/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/md5/Makefile (renamed from crypto/md5/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/mdc2/Makefile (renamed from crypto/mdc2/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/objects/Makefile (renamed from crypto/objects/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ocsp/Makefile (renamed from crypto/ocsp/Makefile.ssl) | 9 | ||||
-rw-r--r-- | crypto/pem/Makefile (renamed from crypto/pem/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/pkcs12/Makefile (renamed from crypto/pkcs12/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/pkcs7/Makefile (renamed from crypto/pkcs7/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/rand/Makefile (renamed from crypto/rand/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/rc2/Makefile (renamed from crypto/rc2/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/rc4/Makefile (renamed from crypto/rc4/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/rc5/Makefile (renamed from crypto/rc5/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ripemd/Makefile (renamed from crypto/ripemd/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/rsa/Makefile (renamed from crypto/rsa/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/sha/Makefile (renamed from crypto/sha/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/stack/Makefile (renamed from crypto/stack/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/store/Makefile (renamed from crypto/store/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/txt_db/Makefile (renamed from crypto/txt_db/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/ui/Makefile (renamed from crypto/ui/Makefile.ssl) | 7 | ||||
-rw-r--r-- | crypto/x509/Makefile (renamed from crypto/x509/Makefile.ssl) | 5 | ||||
-rw-r--r-- | crypto/x509v3/Makefile (renamed from crypto/x509v3/Makefile.ssl) | 7 | ||||
-rw-r--r-- | engines/Makefile (renamed from engines/Makefile.ssl) | 7 | ||||
-rw-r--r-- | ssl/Makefile (renamed from ssl/Makefile.ssl) | 7 | ||||
-rw-r--r-- | test/Makefile (renamed from test/Makefile.ssl) | 13 | ||||
-rw-r--r-- | tools/Makefile (renamed from tools/Makefile.ssl) | 9 |
54 files changed, 172 insertions, 223 deletions
@@ -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 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 @@ -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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 |