Blow away Makefile.ssl.

diff --git a/Configure b/Configure
index 239ae105fa558ffd0afd147d80d31ece9a72c558..7c91ef5e0b2ecee56c8a4d757f505afc265301bb 100755 (executable)
--- 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 d47d3b937db6df3c8af9c0bd444c3cc7cb83a7ba..6b580d6ab6ef022fa39fb4b464dad52138285a48 100644 (file)
--- 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 c0efd47eb2d4b5f9322859bb9f3ede6cb9cb134a..671944bb2c6f4ca172c49c01f2113049dc7da336 100644 (file)
--- 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 711af61541a9711181e65ed00b8f1442996ce960..e7cc768a79defbdf24797bcc12d3b4e80898c844 100755 (executable)
--- 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 bb9df4a642cffa4fcea622e38ccc74aa16730862..c7ce69d6a4be7cff584e0e21d7f63ae5840e258f 100644 (file)
--- 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 7f7f141b4483668224c4595c3f96a8d1246714b2..bdd11b33a2efd0af6b2575a07d120e1603005a34 100644 (file)
--- 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 18cf975dca06f63f801574751f8e853a75109a85..b877e5cc1ff31a89192ab98f86a2c75ba9fcb762 100644 (file)
--- 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 89894dd035e33b41a46e3a1cc4b6e7b9fcd27178..778d9084e4aeccf701a77b3631b3601e41077f65 100644 (file)
--- 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 85be2ed0103f07e6565a7af75032c147e13a172f..976c5cd6463e7e7b37a14f5b334f33b85db4fd98 100644 (file)
--- 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 817bfa54cd871fe147851d0de27b4e1256f1d371..75437cdbccc9030f8b31626e2b49e6769ef6788a 100644 (file)
--- 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 25facaeb05f76e8faf0640f429d0d50f2428f494..d80e361dc2e8a56fc70b8891da7b70792f8a41c5 100644 (file)
--- 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 5ff5b7a71522cb9616659b6ff9671f5d2727ea43..03f9b411d5edf2e03e0c40e8d3e9d4622d1e2e3c 100644 (file)
--- 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 c2950086ce457123bc596c56ecb77ea93380d2df..41369ab06cf24cd7123be8a4b4412ad7e447c8a5 100644 (file)
--- 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 e752678e49a6e068eb5ff04369a204a4266c65f8..1c039081d09b605a6ea31103c1c0cf511e4d7ec1 100644 (file)
--- 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 a0c1baa8ab2872a5b331bdae4ca90bff5e3b5828..82a3f6be13f4f809450438ff28f6ce42fef26180 100644 (file)
--- 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 fe5c3f4ae57c084bdd4a560fc7dc80dc1430c97e..121b7a7a3b6bf957a29d8c9599a6c331b973c2c9 100644 (file)
--- 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 0ce7445cb95167665041305f1fd5eeca47c3d9dc..c4cac81ba64b5a0e1a1ed08165f682d78a9693fe 100644 (file)
--- 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 7478f4c532a156cea6203fc95aded8c50e885c77..028da8df5025b87da263f9e6ff96628959a3a7f1 100644 (file)
--- 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 f0bb149ae62ed631713e957a937e0b91613d042d..5f708da15f56a53867e141ddf606d11779d931a3 100644 (file)
--- 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 7e1dfefd85718d002d003ceb90ee8644e7ec6e04..17d8883eba1e6b081e8af3d357dac389399eff69 100644 (file)
--- 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 e096a0a90eacf5edb4b91f2cde377e385be2cbd8..f63dc2e57843ef958040c0a7969949a5a2915a7e 100644 (file)
--- 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 f75297fd0cfc20c5ae8d22cf84e2a3f9ea3880cc..af96d18910a96cea5891606b0baf4f709c1e1ec6 100644 (file)
--- 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 5630819423596de8eabf85b8098537a4664b8702..e8bbc783b18c7ab6c9b5f04099e06600450b7d91 100644 (file)
--- 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 4a38c03de91a34b223edb1c992774db71a7d8c87..e8671236de36af52d4bdb785b7f69870dc6bf864 100644 (file)
--- 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 6b6d9c3ba9974f2448d0ed7314265b3aa76dc82e..aade0cf4ac01e85a3aa726373e501069a72e7c5d 100644 (file)
--- 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 4ceb09515113ce0545710a189437e844b6cf4552..f6511467f076707087ff0d269602d3d9cd4258a3 100644 (file)
--- 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 98be630fb639e2f5a4a717bd54ab0ccf65fd8e4e..2f943ef37456e868aa1a0297d3a366b57904cf60 100644 (file)
--- 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 426cdb25a2147ea4fbda5471a2ecd5b317f4cdf6..152072439c5b1f0d86e9a4b2eb6e6ad849add334 100644 (file)
--- 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 213ed2932cf41202655d4d1436a43fb31fe2418d..c92c25efa52f74e356b9420fbb8349678364169d 100644 (file)
--- 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 d1eb9519f9522cf0c8ea6bdccdf97eb055a2e760..1ad7cd1ab7246398438ccbcdd3d513cf48952593 100644 (file)
--- 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 5d1a29f6ab3c70ae90c988d572391a7cb9dcab0e..86f0f85422004cf0c95fc31167227978a54b4afe 100644 (file)
--- 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 8ce78cac5c4d1a1ad3981d1e17fae0f132310a69..a51e868f1437eaaad9f22ddc9a45ca123cb2bf7c 100644 (file)
--- 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 3f01f9df6d252d3c61f85b50e50b45dd30c88c36..f332d694eb5595796df9328779e6e8d03cf77bee 100644 (file)
--- 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 c4f50af842def5786fdd6f66b71cbd64307bce47..af60c0119d3513d6f21dd4f6d1b1e0e8966685eb 100644 (file)
--- 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 02156ef659e8379f796d0a77b3470295e1fc34b1..2f15126b896158593f4b4a66ab2f99db2961d1ea 100644 (file)
--- 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 13860527ab182b14bfc67345cb8363e547a491cd..a2c366afd4bcd32ddff75bdac2ed6b4801d5b2da 100644 (file)
--- 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 f8161ecb24ab3968a85c984a726653e44af54b79..f7a262808a2c4695e6573faa5d0a47c85915ab38 100644 (file)
--- 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 e5da96e865c194e355dcc084ae91fd4f63ab2ace..7c34f28a83e2bb145323173f3e18cc7441c84658 100644 (file)
--- 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 2a036d3037ee06279cc94c434a6d2fc6729a574a..c284847d1f31bfd9c916686b7b73e00871567ed9 100644 (file)
--- 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 7e98de885a6ffbc98b91b8631291675775f487df..91fb3ac8031338dcedde0d156f3f6e28725c9ac6 100644 (file)
--- 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 e5d2b2b4622a6ef40f1dcb14429a907dccfb7776..031ecd746481da66aaa0ce409eba629757bfaec5 100644 (file)
--- 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 051695cd19c32f444696e06b697e49b6b5da1e90..dcfc506fa0d1b9ccb74a8d63a349be6121dada28 100644 (file)
--- 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 361933164436681854e8e5cb238ea914100055d1..b12bf3fe1e53e1c29452b3757189082bab85dc52 100644 (file)
--- 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 71adb3c38cf84062aa01f190ef962c56914c8e69..2c8159c3333afecb925667c170826df4df24ad61 100644 (file)
--- 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 abf384a39d2243189ccb1190ec0ec3f114ecd223..55a031d2843779c1f705c9057dbd05548128f7f8 100644 (file)
--- 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 29900878c23007aa7919c3d6fdd99f5f8e4263c9..de50de88f4f0968d5a74c76a29b0173c5bf84d29 100644 (file)
--- 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 57b5dea7022e1ba74cb44138d8b0c6e417ffd6c4..cdbeb0780f23070b8e454c497e098d56361ab2a9 100644 (file)
--- 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 9906d721b32c6cdb35c2d203c1b9418f7688a879..c4f200a08b32dc816bbe263ce57e8b88f8478428 100644 (file)
--- 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 e9293a8484b0428c0bf3d7a8c312d04166e5b41d..59684330b9fbaef0be9dbd0371e38136bbee93f0 100644 (file)
--- 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 f91301188c28c17904106aa6542a0af8c59672f2..e2ae7e77401bbc8e7cfe97a95e3384af850a2e8b 100644 (file)
--- 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 8ae81f33ce31de98d9a1f32c92d20448a04316ac..190dca74aeae61862d8a8521dfc6d3861cb6b4d5 100644 (file)
--- 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 c0f7e347a9ee242271aaa8bc6f7e4d94560a025a..20e5bccd4295c1c1703b42a8de071bec0382bdf3 100644 (file)
--- 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 394d77899fa3d2c3df7084c2d5278bc1cc7eec37..9fd937aabf403e88d82208ab8360e740206bf2b6 100644 (file)
--- 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 cb33d4a41eee0a2225888c252c2005b34f5b6453..c0770b3cbcd2205348002b6e96732d062aa0c9af 100644 (file)
--- 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: