Browse Source

Blow away Makefile.ssl.

master
Ben Laurie 18 years ago
parent
commit
42ba5d2329
54 changed files with 172 additions and 223 deletions
  1. +2
    -2
      Configure
  2. +7
    -8
      Makefile.org
  3. +4
    -5
      apps/Makefile
  4. +2
    -0
      config
  5. +5
    -7
      crypto/Makefile
  6. +3
    -4
      crypto/aes/Makefile
  7. +3
    -4
      crypto/asn1/Makefile
  8. +3
    -4
      crypto/bf/Makefile
  9. +3
    -4
      crypto/bio/Makefile
  10. +3
    -4
      crypto/bn/Makefile
  11. +3
    -4
      crypto/buffer/Makefile
  12. +3
    -4
      crypto/cast/Makefile
  13. +3
    -4
      crypto/comp/Makefile
  14. +3
    -4
      crypto/conf/Makefile
  15. +3
    -4
      crypto/des/Makefile
  16. +3
    -4
      crypto/dh/Makefile
  17. +3
    -4
      crypto/dsa/Makefile
  18. +3
    -4
      crypto/dso/Makefile
  19. +3
    -4
      crypto/ec/Makefile
  20. +3
    -4
      crypto/ecdh/Makefile
  21. +3
    -4
      crypto/ecdsa/Makefile
  22. +3
    -4
      crypto/engine/Makefile
  23. +3
    -4
      crypto/err/Makefile
  24. +3
    -4
      crypto/evp/Makefile
  25. +3
    -4
      crypto/hmac/Makefile
  26. +3
    -4
      crypto/idea/Makefile
  27. +4
    -5
      crypto/krb5/Makefile
  28. +3
    -4
      crypto/lhash/Makefile
  29. +3
    -4
      crypto/md2/Makefile
  30. +3
    -4
      crypto/md4/Makefile
  31. +3
    -4
      crypto/md5/Makefile
  32. +3
    -4
      crypto/mdc2/Makefile
  33. +3
    -4
      crypto/objects/Makefile
  34. +4
    -5
      crypto/ocsp/Makefile
  35. +3
    -4
      crypto/pem/Makefile
  36. +3
    -4
      crypto/pkcs12/Makefile
  37. +3
    -4
      crypto/pkcs7/Makefile
  38. +3
    -4
      crypto/rand/Makefile
  39. +3
    -4
      crypto/rc2/Makefile
  40. +3
    -4
      crypto/rc4/Makefile
  41. +3
    -4
      crypto/rc5/Makefile
  42. +3
    -4
      crypto/ripemd/Makefile
  43. +3
    -4
      crypto/rsa/Makefile
  44. +3
    -4
      crypto/sha/Makefile
  45. +3
    -4
      crypto/stack/Makefile
  46. +3
    -4
      crypto/store/Makefile
  47. +3
    -4
      crypto/txt_db/Makefile
  48. +3
    -4
      crypto/ui/Makefile
  49. +2
    -3
      crypto/x509/Makefile
  50. +3
    -4
      crypto/x509v3/Makefile
  51. +3
    -4
      engines/Makefile
  52. +3
    -4
      ssl/Makefile
  53. +6
    -7
      test/Makefile
  54. +4
    -5
      tools/Makefile

+ 2
- 2
Configure View File

@ -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;


+ 7
- 8
Makefile.org View 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


apps/Makefile.ssl → apps/Makefile View File


+ 2
- 0
config View File

@ -20,6 +20,8 @@
# Be as similar to the output of config.guess/config.sub
# as possible.
set -x
PREFIX=""
SUFFIX=""
TEST="false"


crypto/Makefile.ssl → crypto/Makefile View File


crypto/aes/Makefile.ssl → crypto/aes/Makefile View File


crypto/asn1/Makefile.ssl → crypto/asn1/Makefile View File


crypto/bf/Makefile.ssl → crypto/bf/Makefile View File


crypto/bio/Makefile.ssl → crypto/bio/Makefile View File


crypto/bn/Makefile.ssl → crypto/bn/Makefile View File


crypto/buffer/Makefile.ssl → crypto/buffer/Makefile View File


crypto/cast/Makefile.ssl → crypto/cast/Makefile View File


crypto/comp/Makefile.ssl → crypto/comp/Makefile View File


crypto/conf/Makefile.ssl → crypto/conf/Makefile View File


crypto/des/Makefile.ssl → crypto/des/Makefile View File


crypto/dh/Makefile.ssl → crypto/dh/Makefile View File


crypto/dsa/Makefile.ssl → crypto/dsa/Makefile View File


crypto/dso/Makefile.ssl → crypto/dso/Makefile View File


crypto/ec/Makefile.ssl → crypto/ec/Makefile View File


crypto/ecdh/Makefile.ssl → crypto/ecdh/Makefile View File


crypto/ecdsa/Makefile.ssl → crypto/ecdsa/Makefile View File


crypto/engine/Makefile.ssl → crypto/engine/Makefile View File


crypto/err/Makefile.ssl → crypto/err/Makefile View File


crypto/evp/Makefile.ssl → crypto/evp/Makefile View File


crypto/hmac/Makefile.ssl → crypto/hmac/Makefile View File


crypto/idea/Makefile.ssl → crypto/idea/Makefile View File


crypto/krb5/Makefile.ssl → crypto/krb5/Makefile View File


crypto/lhash/Makefile.ssl → crypto/lhash/Makefile View File


crypto/md2/Makefile.ssl → crypto/md2/Makefile View File


crypto/md4/Makefile.ssl → crypto/md4/Makefile View File


crypto/md5/Makefile.ssl → crypto/md5/Makefile View File


crypto/mdc2/Makefile.ssl → crypto/mdc2/Makefile View File


crypto/objects/Makefile.ssl → crypto/objects/Makefile View File


crypto/ocsp/Makefile.ssl → crypto/ocsp/Makefile View File


crypto/pem/Makefile.ssl → crypto/pem/Makefile View File


crypto/pkcs12/Makefile.ssl → crypto/pkcs12/Makefile View File


crypto/pkcs7/Makefile.ssl → crypto/pkcs7/Makefile View File


crypto/rand/Makefile.ssl → crypto/rand/Makefile View File


crypto/rc2/Makefile.ssl → crypto/rc2/Makefile View File


crypto/rc4/Makefile.ssl → crypto/rc4/Makefile View File


crypto/rc5/Makefile.ssl → crypto/rc5/Makefile View File


crypto/ripemd/Makefile.ssl → crypto/ripemd/Makefile View File


crypto/rsa/Makefile.ssl → crypto/rsa/Makefile View File


crypto/sha/Makefile.ssl → crypto/sha/Makefile View File


crypto/stack/Makefile.ssl → crypto/stack/Makefile View File


crypto/store/Makefile.ssl → crypto/store/Makefile View File


crypto/txt_db/Makefile.ssl → crypto/txt_db/Makefile View File


crypto/ui/Makefile.ssl → crypto/ui/Makefile View File


crypto/x509/Makefile.ssl → crypto/x509/Makefile View File


crypto/x509v3/Makefile.ssl → crypto/x509v3/Makefile View File


engines/Makefile.ssl → engines/Makefile View File


ssl/Makefile.ssl → ssl/Makefile View File


test/Makefile.ssl → test/Makefile View File


tools/Makefile.ssl → tools/Makefile View File


Loading…
Cancel
Save