diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-07-12 16:34:34 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-07-12 16:34:34 +0000 |
| commit | cb9c5dc571977e8a307b187e907d73567f294c9c (patch) | |
| tree | a41f940782eb3f46f588f56c040ddc4c850029c3 /Makefile.org | |
| parent | a6f8bbcad9409c36ef9fdf596835d5aa8e24dd27 (diff) | |
Merge from main, all conflicts resolved.
(I do this far too seldom...)
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 72b7693e16..33337a96a2 100644 --- a/Makefile.org +++ b/Makefile.org @@ -308,8 +308,10 @@ util/libeay.num:: util/ssleay.num:: perl util/mkdef.pl ssl update -crypto/objects/obj_dat.h: crypto/objects/objects.h crypto/objects/obj_dat.pl - perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h +crypto/objects/obj_dat.h: crypto/objects/obj_mac.h crypto/objects/obj_dat.pl + perl crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h +crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt + perl crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h TABLE: Configure (echo 'Output of `Configure TABLE'"':"; \ |