Finish elimination of Makefile.ssl

diff --git a/Configure b/Configure
index 34e2a004084cced30c0daaacfb92c1618f630ac9..c32426a27f0d99d0bf92ac6342287895d92dc0f2 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -610,7 +610,7 @@ my $threads=0;
 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";
@@ -1492,7 +1492,7 @@ if($IsWindows) {
        printf OUT <<EOF;
 #ifndef MK1MF_BUILD
   /* auto-generated by Configure for crypto/cversion.c:
-   * for Unix builds, crypto/Makefile.ssl generates functional definitions;
+   * for Unix builds, crypto/Makefile generates functional definitions;
    * Windows builds (and other mk1mf builds) compile cversion.c with
    * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
   #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
@@ -1500,7 +1500,7 @@ if($IsWindows) {
 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 "" && $make_depend;

diff --git a/Makefile b/Makefile
index 47cc4183b6968190984702925af6264bd7710221..41a4c32a51b941d5e89de8219f9ac79a742c3c14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,7 @@ FDIRS=      sha1 rand des aes dsa rsa
 # should be performed.
 TESTS = alltests
 
-MAKEFILE= Makefile.ssl
-MAKE=     make -f Makefile.ssl
+MAKEFILE= Makefile
 
 MANDIR=$(OPENSSLDIR)/man
 MAN1=1
@@ -224,7 +223,7 @@ HEADER=         e_os.h
 # When we're prepared to use shared libraries in the programs we link here
 # we might remove 'clean-shared' from the targets to perform at this stage
 
-all: Makefile.ssl sub_all openssl.pc
+all: Makefile sub_all openssl.pc
 
 sigs:  $(SIGS)
 libcrypto.sha1: libcrypto.a
@@ -598,7 +597,7 @@ do_reliantunix-shared:
        libs="-l$$i $$libs"; \
        done
 
-openssl.pc: Makefile.ssl
+openssl.pc: Makefile
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            echo 'libdir=$${exec_prefix}/lib'; \
@@ -611,8 +610,8 @@ openssl.pc: Makefile.ssl
            echo 'Libs: -L$${libdir} -lssl -lcrypto $(LIBKRB5) $(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
 
@@ -642,7 +641,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
        @for i in $(DIRS) ;\
        do \
        if [ -d "$$i" ]; then \
@@ -652,7 +651,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)
        @for i in $(DIRS); do \

diff --git a/Makefile.org b/Makefile.org
index f2e31a57948612b15ab753495ac1a56e229628d2..b6d600ed32ef694aaa6e992ede2fa269560cef35 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -190,8 +190,7 @@ FDIRS=      sha1 rand des aes dsa rsa
 # should be performed.
 TESTS = alltests
 
-MAKEFILE= Makefile.ssl
-MAKE=     make -f Makefile.ssl
+MAKEFILE= Makefile
 
 MANDIR=$(OPENSSLDIR)/man
 MAN1=1
@@ -222,7 +221,7 @@ HEADER=         e_os.h
 # When we're prepared to use shared libraries in the programs we link here
 # we might remove 'clean-shared' from the targets to perform at this stage
 
-all: Makefile.ssl sub_all openssl.pc
+all: Makefile sub_all openssl.pc
 
 sigs:  $(SIGS)
 libcrypto.sha1: libcrypto.a
@@ -596,7 +595,7 @@ do_reliantunix-shared:
        libs="-l$$i $$libs"; \
        done
 
-openssl.pc: Makefile.ssl
+openssl.pc: Makefile
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            echo 'libdir=$${exec_prefix}/lib'; \
@@ -609,8 +608,8 @@ openssl.pc: Makefile.ssl
            echo 'Libs: -L$${libdir} -lssl -lcrypto $(LIBKRB5) $(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
 
@@ -640,7 +639,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
        @for i in $(DIRS) ;\
        do \
        if [ -d "$$i" ]; then \
@@ -650,7 +649,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)
        @for i in $(DIRS); do \

diff --git a/apps/Makefile b/apps/Makefile
index 7068286204b2a7cd22b9ad23d383a2f60af71d2d..2659a3862433e2ea6f2a5f9bb9bb69b3c3cfe30a 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,5 +1,5 @@
 #
-#  apps/Makefile.ssl
+#  apps/Makefile
 #
 
 DIR=           apps
@@ -10,10 +10,9 @@ CFLAG=               -g -static
 INSTALL_PREFIX=
 INSTALLTOP=    /usr/local/ssl
 OPENSSLDIR=    /usr/local/ssl
-MAKE=          make -f Makefile.ssl
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=      Makefile.ssl
+MAKEFILE=      Makefile
 PERL=          perl
 RM=            rm -f
 # KRB5 stuff
@@ -94,7 +93,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:
        @for i in $(EXE); \
@@ -121,7 +120,6 @@ tags:
 tests:
 
 links:
-       @sh $(TOP)/util/point.sh Makefile.ssl Makefile
 
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff

diff --git a/crypto/Makefile b/crypto/Makefile
index 0914a7c99e2ea115711bd86f0d40765bfd4d85b5..347de0cc113b49cb93ff7b0f8a3fbd2a0bccd313 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -11,10 +11,9 @@ 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
 RM=             rm -f
 AR=            ar r
 
@@ -52,9 +51,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`\""; \
@@ -73,7 +72,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..." && \
@@ -81,11 +80,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 b/crypto/aes/Makefile
index 30f28a095206c310d808cca75d56ed8bb9f4c18c..71087bc18f1e37e43b8b73d4f209d22d4751520e 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -11,10 +11,9 @@ 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
 
 # CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr
@@ -49,10 +48,9 @@ lib: $(LIBOBJ)
 $(LIBOBJ): $(LIBSRC)
 
 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 b/crypto/asn1/Makefile
index cb45194d48e392cfd5533b2cdd85c0332c6e522d..61145cba5aa751950b0df4fe38bb75d402995ed6 100644 (file)
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -74,10 +73,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 b/crypto/bf/Makefile
index be3ad77a0563e87bfd9feb47cf377e1c1acdfe87..0a2a4439dcf9ee2fc0bf707eadf6392b386864de 100644 (file)
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -11,10 +11,9 @@ 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
 
 BF_ENC=                bf_enc.o
@@ -65,10 +64,9 @@ asm/bx86unix.cpp: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
        (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp)
 
 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 b/crypto/bio/Makefile
index d0b9e297b082c38fda592d2b6e6fb8dd3fc85dc9..7da953202d10740582eb1efe65c076af0b4c35fa 100644 (file)
--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -54,10 +53,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 b/crypto/bn/Makefile
index 50892ef44c6b639c2e643d7291f50b2187709800..15ff085b113e993cdb511311548337ea8590c155 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -11,10 +11,9 @@ 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
 
 BN_ASM=                bn_asm.o
@@ -124,10 +123,9 @@ asm/pa-risc2W.o: asm/pa-risc2W.s
        /usr/ccs/bin/as -o asm/pa-rics2W.o asm/pa-risc2W.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/buffer/Makefile b/crypto/buffer/Makefile
index b131ca307894ce1aa5f53797196b5e172ea287b1..8593dce0e480660a71786024eadf486fc79ade11 100644 (file)
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/cast/Makefile
index 98393a37ba5d59e93817665571e4b081d23d9d8c..f338e88ad56091468bae8a69a7ac18c986bc2a70 100644 (file)
--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@@ -11,10 +11,9 @@ 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
 
 CAST_ENC=c_enc.o
@@ -68,10 +67,9 @@ asm/cx86unix.cpp: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
        (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp)
 
 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 b/crypto/comp/Makefile
index f70ba1b2853d0013bcb857e6955fd66ca76c2b4c..1f0fcb78424e109d9c4602055bba45cc1a8aa5a8 100644 (file)
--- a/crypto/comp/Makefile
+++ b/crypto/comp/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,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/conf/Makefile b/crypto/conf/Makefile
index c5873bc6e78285d812a0a16aa1e11f28a0abdda9..155cc6c8fb1d73451a51d677bab52057b3661418 100644 (file)
--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,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/des/Makefile b/crypto/des/Makefile
index 0d9ba2b42f27b234476849dedbe99a47df6a9045..b6c2b9a8dfe0f1a97fcc10cd3c960b411bf3bf88 100644 (file)
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -11,10 +11,9 @@ 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
 RANLIB=                ranlib
 DES_ENC=       des_enc.o fcrypt_b.o
@@ -94,10 +93,9 @@ asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp)
 
 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 b/crypto/dh/Makefile
index e05fc01a12837f5c537b4a7e5de1b4fbdc2fffbc..a0e8217fa8af91abf384f37358b993ecab2771cf 100644 (file)
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/dsa/Makefile
index 1784c17598817239bcaaefe1c24263c29a3a23ee..418db981d31c1c005d58bf125e009fe0f8c52a3d 100644 (file)
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -46,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/dso/Makefile b/crypto/dso/Makefile
index c0449d184e5ba028e2f789100d48124868636ace..dd8d2434858332a20dc3958b66e6262931d060b6 100644 (file)
--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -46,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/ec/Makefile b/crypto/ec/Makefile
index a2805c47a2f59a341b73642f4211b7418ede9aac..92272f28815522a176072e187550fbe60485abaa 100644 (file)
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,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/engine/Makefile b/crypto/engine/Makefile
index 30a4446ff969ff0d4ca9d812c94291d5e70a7700..61942acf6d55e2cbf81e2508e9b039e31ba553a2 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -54,10 +53,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 b/crypto/err/Makefile
index 1256eac8d3395c4eec5db3649a2d6d566d45eb6d..10a69fcbe829d4595712828e8029051365c5e065 100644 (file)
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/evp/Makefile
index f33aebd33a2c712cc6c82a10abcc6a5cbe02bcf3..af5e139f0d6754ace7accd8a492a95e5b2f7c97c 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -64,10 +63,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 b/crypto/hmac/Makefile
index f1c07322c4bbdbfafc19478a40b0235e00d1118d..6033f0ae1858998ef7d10125f98a62d7ca99c959 100644 (file)
--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/idea/Makefile
index fa016ea399e308ce526abefa5a40ee871db53ab8..fbf8a162e8e4758f72db20c8c41d90a268f06549 100644 (file)
--- a/crypto/idea/Makefile
+++ b/crypto/idea/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/krb5/Makefile
index d9224c0f092d3470ea2f17009f10ffd2c69ef0e4..b931505abed1c18d03e1697b15d7ba86013971a7 100644 (file)
--- a/crypto/krb5/Makefile
+++ b/crypto/krb5/Makefile
@@ -1,5 +1,5 @@
 #
-# OpenSSL/krb5/Makefile.ssl
+# OpenSSL/krb5/Makefile
 #
 
 DIR=   krb5
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -45,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/lhash/Makefile b/crypto/lhash/Makefile
index 60e7ee3393150da7913789532099c4caa917f193..a38423a5402a1d42af76e81cb82a75ebf52ce5b9 100644 (file)
--- a/crypto/lhash/Makefile
+++ b/crypto/lhash/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/md2/Makefile
index 3206924c900a56e018be6a1474cea435efcd9204..975eda236718776f27a933940f9cd1a8621bba41 100644 (file)
--- a/crypto/md2/Makefile
+++ b/crypto/md2/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/md4/Makefile
index bb60c344668774b25eeb4187e94b65092699c402..ac99dc5d95a42f9d20db8a41e2405991074e12e7 100644 (file)
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -11,10 +11,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -45,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/md5/Makefile b/crypto/md5/Makefile
index 17e97a1584058d596c594a62ac54caf565c231cd..9edec1a226fdb42a6a7618735836e57c622b0793 100644 (file)
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -11,10 +11,9 @@ 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
 
 MD5_ASM_OBJ=
@@ -81,10 +80,9 @@ asm/md5-sparcv9.o: asm/md5-sparcv9.S
                -o asm/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 b/crypto/mdc2/Makefile
index 33f366fb087d568642257f5789cfd6830a31d0a7..7b701644230aac7deffff8b572db2c2b63b7520c 100644 (file)
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/objects/Makefile
index 3e7a194cf99087c41d1350bbdb49f2c5b709a45d..48a912846f2648f9224fbceed586da76091a9947 100644 (file)
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -10,10 +10,9 @@ 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
 PERL=          perl
 
@@ -52,10 +51,9 @@ obj_mac.h: objects.pl objects.txt obj_mac.num
        $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
 
 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 b/crypto/ocsp/Makefile
index 02477be53868b67051a83e48ba6c1323f2355659..7135ba6b9404b6a1a662bc50dd4e794486e3c56e 100644 (file)
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -1,5 +1,5 @@
 #
-# OpenSSL/ocsp/Makefile.ssl
+# OpenSSL/ocsp/Makefile
 #
 
 DIR=   ocsp
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,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/pem/Makefile b/crypto/pem/Makefile
index d3043eb4013f355d014a7b552b2139da429d4f07..55a6fa69f2277474826f31048f41e33941deadb9 100644 (file)
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,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: $(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 b/crypto/pkcs12/Makefile
index a6e47b40855b25237b6fc5c08e76a2c195f222c1..0bd0b7a9779409a91ca705c0076dd361775b111d 100644 (file)
--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -50,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/pkcs7/Makefile b/crypto/pkcs7/Makefile
index c3bfc7d560e93bc60242962a8bacbe66a179472b..7eda4e8a6ac2a146de8ce2ed284560182250f523 100644 (file)
--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@@ -10,10 +10,9 @@ 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
 
 PEX_LIBS=
@@ -65,10 +64,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 b/crypto/rand/Makefile
index 0a936dd602d1ba7de5b22c375995ead6c4dbb75f..4ab4b9c7b00f147ef98364e63cd26828d62d828f 100644 (file)
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -46,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/rc2/Makefile b/crypto/rc2/Makefile
index 98d5960d5d6cf801db89e15af01be88ab7f536cc..982b9c911df0c958f5938e1be6c0c16794fd2cbe 100644 (file)
--- a/crypto/rc2/Makefile
+++ b/crypto/rc2/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/rc4/Makefile
index 3e602662be2b7e2293757490c9747823e74b530d..15da280838e2c75ee66db71d4445f870a8c67063 100644 (file)
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -11,10 +11,9 @@ 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
 
 RC4_ENC=rc4_enc.o
@@ -68,10 +67,9 @@ asm/rx86unix.cpp: asm/rc4-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp)
 
 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 b/crypto/rc5/Makefile
index 3f9632f8f7538a9422a25c4f176dc30d50da5e30..09133f028788c8ae825ad302dd41f373359ff993 100644 (file)
--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@@ -11,10 +11,9 @@ 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
 
 RC5_ENC=               rc5_enc.o
@@ -65,10 +64,9 @@ asm/r586unix.cpp: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
        (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp)
 
 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 b/crypto/ripemd/Makefile
index 56398936a87cf94998e63383d4416bcc338dbdfe..d727cd3c9e0dae0ea8b1cc35bfd1fc956df60fae 100644 (file)
--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@@ -11,10 +11,9 @@ 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
 
 RIP_ASM_OBJ=
@@ -63,10 +62,9 @@ asm/rm86unix.cpp: asm/rmd-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp)
 
 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 b/crypto/rsa/Makefile
index 8089344a046f1e68629729f693e61d7cc4e17506..7e666a072fb50c73fc47a89b1a18a6b23b3b2893 100644 (file)
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -48,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/sha/Makefile b/crypto/sha/Makefile
index 83dfef09c585a4e24fa0864702fbb77d45beb53b..08e2750868dfffed73bcec69311a375fe7c6c10f 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -11,10 +11,9 @@ 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
 
 SHA1_ASM_OBJ=
@@ -63,10 +62,9 @@ asm/sx86unix.cpp: asm/sha1-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp)
 
 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 b/crypto/stack/Makefile
index 7120fb804a07200ab365ea94c506f08923828394..1f258148d42d148ceae13fe2c408be372d30c1d0 100644 (file)
--- a/crypto/stack/Makefile
+++ b/crypto/stack/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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/txt_db/Makefile b/crypto/txt_db/Makefile
index 6221dfae4d1008b573fe250026a98fbfbc55d971..15ae6ceda84e1c72270a081cc3848a62e714353f 100644 (file)
--- a/crypto/txt_db/Makefile
+++ b/crypto/txt_db/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -44,10 +43,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 b/crypto/ui/Makefile
index ba46951d1c39f01bb072f5fb3a382d9228dc0e24..004593121802775ea35f6f6a4d98a63c8656f744 100644 (file)
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -48,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/x509/Makefile b/crypto/x509/Makefile
index 3a3452536c5ad92fcd7a5e788fe93dfda74c1417..be61a48214cf036b79a98b650cdce1485cacaa65 100644 (file)
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -54,10 +53,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/x509v3/Makefile b/crypto/x509v3/Makefile
index 66df90c34624bc70922204b733a5e81e0d9b12ca..7b0d03ac6102b5d1509e519f60b704c5d8630487 100644 (file)
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -50,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/fips/Makefile b/fips/Makefile
index ad2f92b47c85390e224ebd9ee17e6ace23550eea..474136e25c763d1f55b403d64dac8892ee1131c9 100644 (file)
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -11,10 +11,9 @@ 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
 RM=             rm -f
 AR=            ar r
 
@@ -66,7 +65,7 @@ sub_target:
        done;
 
 files:
-       $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
        @for i in $(FDIRS) ;\
        do \
        (cd $$i && echo "making 'files' in fips/$$i..." && \
@@ -74,7 +73,6 @@ files:
        done;
 
 links:
-       @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
        @for i in $(FDIRS); do \
        (cd $$i && echo "making links in fips/$$i..." && \

diff --git a/fips/aes/Makefile b/fips/aes/Makefile
index 33f6cf2bdd592ebb7b62c0aad0cc59b26960f966..b085d43122b149c85ec0f858146736ed1b7ca9f6 100644 (file)
--- a/fips/aes/Makefile
+++ b/fips/aes/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -48,10 +47,9 @@ lib: $(LIBOBJ)
        @sleep 2; 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)

diff --git a/fips/des/Makefile b/fips/des/Makefile
index 017fb325c00c1bca72e70974f8439a2fc95c82cf..cb01f974a299667804329be70238353dd0d453df 100644 (file)
--- a/fips/des/Makefile
+++ b/fips/des/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG) -g
@@ -47,10 +46,9 @@ lib: $(LIBOBJ)
        @sleep 2; 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)

diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index eb94ad8e743e75cffe2beb357936ae5b01034ac8..7f7c81f7e0a7709718827fb2aa66c0f1bfbaed6a 100644 (file)
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,10 +46,9 @@ check:
        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
 
 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)

diff --git a/fips/rand/Makefile b/fips/rand/Makefile
index 0248ecc93324a50d0967efd34323923d7c454abb..dfb7a10de859ef2a3282630a7f4b906d6d5d7c93 100644 (file)
--- a/fips/rand/Makefile
+++ b/fips/rand/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,10 +46,9 @@ lib: $(LIBOBJ)
        @sleep 2; 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)

diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile
index 83063975079132d30f31dedeb7d2270c242b167f..91c2d49c27f969da2b38c844e29b1442b823c460 100644 (file)
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -47,10 +46,9 @@ check:
        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
 
 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)

diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index 75b5debdef5086f18510f6565d6e9636e17bb23f..c579f2f273ab08a18b612538dfa451d7f1c5abe1 100644 (file)
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -10,10 +10,9 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -56,10 +55,9 @@ fips_standalone_sha1: fips_standalone_sha1.o fips_sha1dgst.o
        fips_sha1dgst.o
 
 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 $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)

diff --git a/ssl/Makefile b/ssl/Makefile
index 8d43d9ef365cfaa6015d5d1288eb23a48c829772..04ed9ed2091696b35de181f3fa3aeb4592175713 100644 (file)
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -10,10 +10,9 @@ 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
 # KRB5 stuff
 KRB5_INCLUDES=
@@ -68,10 +67,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 b/test/Makefile
index d2079c004c749e9d22df694e0e3529ff644d9847..672b4f95b265757bad0f65500b84cb845c6c76b4 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# test/Makefile.ssl
+# test/Makefile
 #
 
 DIR=           test
@@ -10,8 +10,7 @@ CFLAG=                -g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=    /usr/local/ssl
-MAKEFILE=      Makefile.ssl
-MAKE=          make -f $(MAKEFILE)
+MAKEFILE=      Makefile
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 PERL=          perl
@@ -24,7 +23,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
@@ -105,10 +104,9 @@ all:       exe
 exe:   $(EXE) dummytest
 
 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):

diff --git a/tools/Makefile b/tools/Makefile
index cb33d4a41eee0a2225888c252c2005b34f5b6453..52a797045529ebc083e9d10ad228fb323937095f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,14 +10,12 @@ 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
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-GENERAL=Makefile.ssl
 TEST=
 APPS= c_rehash
 MISC_APPS= c_hash c_info c_issuer c_name
@@ -39,10 +37,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: