summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2004-05-11 12:46:24 +0000
committerBen Laurie <ben@openssl.org>2004-05-11 12:46:24 +0000
commit3642f632d3120ca512e11613cab14d69ca66fe73 (patch)
treecabb035fcc5dd6096f511250c17b652fe010551c /crypto/pkcs12
parentaaa16d00017d801bc583bc93da4337b37dc7a9bd (diff)
Pull FIPS back into stable.
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r--crypto/pkcs12/Makefile (renamed from crypto/pkcs12/Makefile.ssl)6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile
index a6e47b4085..0bd0b7a977 100644
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile
@@ -10,10 +10,9 @@ CFLAG=-g
INSTALL_PREFIX=
OPENSSLDIR= /usr/local/ssl
INSTALLTOP=/usr/local/ssl
-MAKE= make -f Makefile.ssl
MAKEDEPPROG= makedepend
MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE= Makefile.ssl
+MAKEFILE= Makefile
AR= ar r
CFLAGS= $(INCLUDES) $(CFLAG)
@@ -50,10 +49,9 @@ lib: $(LIBOBJ)
@touch lib
files:
- $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
links:
- @sh $(TOP)/util/point.sh Makefile.ssl Makefile
@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)