Blow away Makefile.ssl.
authorBen Laurie <ben@openssl.org>
Wed, 30 Mar 2005 13:05:57 +0000 (13:05 +0000)
committerBen Laurie <ben@openssl.org>
Wed, 30 Mar 2005 13:05:57 +0000 (13:05 +0000)
54 files changed:
Configure
Makefile.org
apps/Makefile [moved from apps/Makefile.ssl with 99% similarity]
config
crypto/Makefile [moved from crypto/Makefile.ssl with 96% similarity]
crypto/aes/Makefile [moved from crypto/aes/Makefile.ssl with 95% similarity]
crypto/asn1/Makefile [moved from crypto/asn1/Makefile.ssl with 99% similarity]
crypto/bf/Makefile [moved from crypto/bf/Makefile.ssl with 94% similarity]
crypto/bio/Makefile [moved from crypto/bio/Makefile.ssl with 98% similarity]
crypto/bn/Makefile [moved from crypto/bn/Makefile.ssl with 99% similarity]
crypto/buffer/Makefile [moved from crypto/buffer/Makefile.ssl with 93% similarity]
crypto/cast/Makefile [moved from crypto/cast/Makefile.ssl with 94% similarity]
crypto/comp/Makefile [moved from crypto/comp/Makefile.ssl with 95% similarity]
crypto/conf/Makefile [moved from crypto/conf/Makefile.ssl with 97% similarity]
crypto/des/Makefile [moved from crypto/des/Makefile.ssl with 98% similarity]
crypto/dh/Makefile [moved from crypto/dh/Makefile.ssl with 97% similarity]
crypto/dsa/Makefile [moved from crypto/dsa/Makefile.ssl with 97% similarity]
crypto/dso/Makefile [moved from crypto/dso/Makefile.ssl with 97% similarity]
crypto/ec/Makefile [moved from crypto/ec/Makefile.ssl with 98% similarity]
crypto/ecdh/Makefile [moved from crypto/ecdh/Makefile.ssl with 97% similarity]
crypto/ecdsa/Makefile [moved from crypto/ecdsa/Makefile.ssl with 97% similarity]
crypto/engine/Makefile [moved from crypto/engine/Makefile.ssl with 99% similarity]
crypto/err/Makefile [moved from crypto/err/Makefile.ssl with 95% similarity]
crypto/evp/Makefile [moved from crypto/evp/Makefile.ssl with 99% similarity]
crypto/hmac/Makefile [moved from crypto/hmac/Makefile.ssl with 92% similarity]
crypto/idea/Makefile [moved from crypto/idea/Makefile.ssl with 92% similarity]
crypto/krb5/Makefile [moved from crypto/krb5/Makefile.ssl with 91% similarity]
crypto/lhash/Makefile [moved from crypto/lhash/Makefile.ssl with 93% similarity]
crypto/md2/Makefile [moved from crypto/md2/Makefile.ssl with 93% similarity]
crypto/md4/Makefile [moved from crypto/md4/Makefile.ssl with 92% similarity]
crypto/md5/Makefile [moved from crypto/md5/Makefile.ssl with 94% similarity]
crypto/mdc2/Makefile [moved from crypto/mdc2/Makefile.ssl with 94% similarity]
crypto/objects/Makefile [moved from crypto/objects/Makefile.ssl with 96% similarity]
crypto/ocsp/Makefile [moved from crypto/ocsp/Makefile.ssl with 98% similarity]
crypto/pem/Makefile [moved from crypto/pem/Makefile.ssl with 98% similarity]
crypto/pkcs12/Makefile [moved from crypto/pkcs12/Makefile.ssl with 99% similarity]
crypto/pkcs7/Makefile [moved from crypto/pkcs7/Makefile.ssl with 98% similarity]
crypto/rand/Makefile [moved from crypto/rand/Makefile.ssl with 97% similarity]
crypto/rc2/Makefile [moved from crypto/rc2/Makefile.ssl with 93% similarity]
crypto/rc4/Makefile [moved from crypto/rc4/Makefile.ssl with 95% similarity]
crypto/rc5/Makefile [moved from crypto/rc5/Makefile.ssl with 94% similarity]
crypto/ripemd/Makefile [moved from crypto/ripemd/Makefile.ssl with 93% similarity]
crypto/rsa/Makefile [moved from crypto/rsa/Makefile.ssl with 98% similarity]
crypto/sha/Makefile [moved from crypto/sha/Makefile.ssl with 96% similarity]
crypto/stack/Makefile [moved from crypto/stack/Makefile.ssl with 92% similarity]
crypto/store/Makefile [moved from crypto/store/Makefile.ssl with 96% similarity]
crypto/txt_db/Makefile [moved from crypto/txt_db/Makefile.ssl with 92% similarity]
crypto/ui/Makefile [moved from crypto/ui/Makefile.ssl with 96% similarity]
crypto/x509/Makefile [moved from crypto/x509/Makefile.ssl with 99% similarity]
crypto/x509v3/Makefile [moved from crypto/x509v3/Makefile.ssl with 99% similarity]
engines/Makefile [moved from engines/Makefile.ssl with 98% similarity]
ssl/Makefile [moved from ssl/Makefile.ssl with 99% similarity]
test/Makefile [moved from test/Makefile.ssl with 99% similarity]
tools/Makefile [moved from tools/Makefile.ssl with 86% similarity]

index 239ae10..7c91ef5 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;
index d47d3b9..6b580d6 100644 (file)
@@ -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
similarity index 99%
rename from apps/Makefile.ssl
rename to apps/Makefile
index c0efd47..671944b 100644 (file)
@@ -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 711af61..e7cc768 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"
similarity index 96%
rename from crypto/Makefile.ssl
rename to crypto/Makefile
index bb9df4a..c7ce69d 100644 (file)
@@ -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 ); \
similarity index 95%
rename from crypto/aes/Makefile.ssl
rename to crypto/aes/Makefile
index 7f7f141..bdd11b3 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/asn1/Makefile.ssl
rename to crypto/asn1/Makefile
index 18cf975..b877e5c 100644 (file)
@@ -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)
similarity index 94%
rename from crypto/bf/Makefile.ssl
rename to crypto/bf/Makefile
index 89894dd..778d908 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/bio/Makefile.ssl
rename to crypto/bio/Makefile
index 85be2ed..976c5cd 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/bn/Makefile.ssl
rename to crypto/bn/Makefile
index 817bfa5..75437cd 100644 (file)
@@ -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)
similarity index 93%
rename from crypto/buffer/Makefile.ssl
rename to crypto/buffer/Makefile
index 25facae..d80e361 100644 (file)
@@ -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)
similarity index 94%
rename from crypto/cast/Makefile.ssl
rename to crypto/cast/Makefile
index 5ff5b7a..03f9b41 100644 (file)
@@ -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)
similarity index 95%
rename from crypto/comp/Makefile.ssl
rename to crypto/comp/Makefile
index c295008..41369ab 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/conf/Makefile.ssl
rename to crypto/conf/Makefile
index e752678..1c03908 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/des/Makefile.ssl
rename to crypto/des/Makefile
index a0c1baa..82a3f6b 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/dh/Makefile.ssl
rename to crypto/dh/Makefile
index fe5c3f4..121b7a7 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/dsa/Makefile.ssl
rename to crypto/dsa/Makefile
index 0ce7445..c4cac81 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/dso/Makefile.ssl
rename to crypto/dso/Makefile
index 7478f4c..028da8d 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/ec/Makefile.ssl
rename to crypto/ec/Makefile
index f0bb149..5f708da 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/ecdh/Makefile.ssl
rename to crypto/ecdh/Makefile
index 7e1dfef..17d8883 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/ecdsa/Makefile.ssl
rename to crypto/ecdsa/Makefile
index e096a0a..f63dc2e 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/engine/Makefile.ssl
rename to crypto/engine/Makefile
index f75297f..af96d18 100644 (file)
@@ -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)
similarity index 95%
rename from crypto/err/Makefile.ssl
rename to crypto/err/Makefile
index 5630819..e8bbc78 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/evp/Makefile.ssl
rename to crypto/evp/Makefile
index 4a38c03..e867123 100644 (file)
@@ -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
similarity index 92%
rename from crypto/hmac/Makefile.ssl
rename to crypto/hmac/Makefile
index 6b6d9c3..aade0cf 100644 (file)
@@ -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)
similarity index 92%
rename from crypto/idea/Makefile.ssl
rename to crypto/idea/Makefile
index 4ceb095..f651146 100644 (file)
@@ -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)
similarity index 91%
rename from crypto/krb5/Makefile.ssl
rename to crypto/krb5/Makefile
index 98be630..2f943ef 100644 (file)
@@ -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)
similarity index 93%
rename from crypto/lhash/Makefile.ssl
rename to crypto/lhash/Makefile
index 426cdb2..1520724 100644 (file)
@@ -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)
similarity index 93%
rename from crypto/md2/Makefile.ssl
rename to crypto/md2/Makefile
index 213ed29..c92c25e 100644 (file)
@@ -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)
similarity index 92%
rename from crypto/md4/Makefile.ssl
rename to crypto/md4/Makefile
index d1eb951..1ad7cd1 100644 (file)
@@ -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)
similarity index 94%
rename from crypto/md5/Makefile.ssl
rename to crypto/md5/Makefile
index 5d1a29f..86f0f85 100644 (file)
@@ -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)
similarity index 94%
rename from crypto/mdc2/Makefile.ssl
rename to crypto/mdc2/Makefile
index 8ce78ca..a51e868 100644 (file)
@@ -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)
similarity index 96%
rename from crypto/objects/Makefile.ssl
rename to crypto/objects/Makefile
index 3f01f9d..f332d69 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/ocsp/Makefile.ssl
rename to crypto/ocsp/Makefile
index c4f50af..af60c01 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/pem/Makefile.ssl
rename to crypto/pem/Makefile
index 02156ef..2f15126 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/pkcs12/Makefile.ssl
rename to crypto/pkcs12/Makefile
index 1386052..a2c366a 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/pkcs7/Makefile.ssl
rename to crypto/pkcs7/Makefile
index f8161ec..f7a2628 100644 (file)
@@ -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)
similarity index 97%
rename from crypto/rand/Makefile.ssl
rename to crypto/rand/Makefile
index e5da96e..7c34f28 100644 (file)
@@ -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)
similarity index 93%
rename from crypto/rc2/Makefile.ssl
rename to crypto/rc2/Makefile
index 2a036d3..c284847 100644 (file)
@@ -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)
similarity index 95%
rename from crypto/rc4/Makefile.ssl
rename to crypto/rc4/Makefile
index 7e98de8..91fb3ac 100644 (file)
@@ -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)
similarity index 94%
rename from crypto/rc5/Makefile.ssl
rename to crypto/rc5/Makefile
index e5d2b2b..031ecd7 100644 (file)
@@ -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)
similarity index 93%
rename from crypto/ripemd/Makefile.ssl
rename to crypto/ripemd/Makefile
index 051695c..dcfc506 100644 (file)
@@ -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)
similarity index 98%
rename from crypto/rsa/Makefile.ssl
rename to crypto/rsa/Makefile
index 3619331..b12bf3f 100644 (file)
@@ -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)
similarity index 96%
rename from crypto/sha/Makefile.ssl
rename to crypto/sha/Makefile
index 71adb3c..2c8159c 100644 (file)
@@ -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)
similarity index 92%
rename from crypto/stack/Makefile.ssl
rename to crypto/stack/Makefile
index abf384a..55a031d 100644 (file)
@@ -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)
similarity index 96%
rename from crypto/store/Makefile.ssl
rename to crypto/store/Makefile
index 2990087..de50de8 100644 (file)
@@ -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)
similarity index 92%
rename from crypto/txt_db/Makefile.ssl
rename to crypto/txt_db/Makefile
index 57b5dea..cdbeb07 100644 (file)
@@ -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)
similarity index 96%
rename from crypto/ui/Makefile.ssl
rename to crypto/ui/Makefile
index 9906d72..c4f200a 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/x509/Makefile.ssl
rename to crypto/x509/Makefile
index e9293a8..5968433 100644 (file)
@@ -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)
similarity index 99%
rename from crypto/x509v3/Makefile.ssl
rename to crypto/x509v3/Makefile
index f913011..e2ae7e7 100644 (file)
@@ -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)
similarity index 98%
rename from engines/Makefile.ssl
rename to engines/Makefile
index 8ae81f3..190dca7 100644 (file)
@@ -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.
similarity index 99%
rename from ssl/Makefile.ssl
rename to ssl/Makefile
index c0f7e34..20e5bcc 100644 (file)
@@ -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)
similarity index 99%
rename from test/Makefile.ssl
rename to test/Makefile
index 394d778..9fd937a 100644 (file)
@@ -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"
similarity index 86%
rename from tools/Makefile.ssl
rename to tools/Makefile
index cb33d4a..c0770b3 100644 (file)
@@ -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: