X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fpem%2FMakefile.ssl;h=4f90ffb79719dc61a0b0db08a7a8da5ee2c7407a;hp=447fcb4c0d28c1cb37c953b933ad4f4827b75c0c;hb=169cc7a11245a1cdecfa01ceade27e4c9a7d7c91;hpb=d02b48c63a58ea4367a0e905979f140b7d090f86

diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index 447fcb4c0d..4f90ffb797 100644
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -9,7 +9,7 @@ INCLUDES= -I.. -I../../include
 CFLAG=-g
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	makedepend -f Makefile.ssl
+MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
 
@@ -21,8 +21,6 @@ GENERAL=Makefile
 TEST=
 APPS=
 
-CTX_SIZE= ctx_size
-
 LIB=$(TOP)/libcrypto.a
 LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c $(ERRC).c
 
@@ -30,7 +28,7 @@ LIBOBJ=	pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o $(ERRC).o
 
 SRC= $(LIBSRC)
 
-EXHEADER= pem.h
+EXHEADER= pem.h pem2.h
 HEADER=	$(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -38,30 +36,21 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
 
-all:	pem.h lib
-
-pem.h: $(CTX_SIZE)
-	./$(CTX_SIZE) <pem.org >pem.new
-	if [ -f pem.h ]; then mv -f pem.h pem.old; fi
-	mv -f pem.new pem.h
-
-$(CTX_SIZE): $(CTX_SIZE).o
-	$(CC) $(CFLAGS) -o $(CTX_SIZE) $(CTX_SIZE).o
+all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
-	sh $(TOP)/util/ranlib.sh $(LIB)
+	$(RANLIB) $(LIB)
 	@touch lib
 
 files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
-links:
-	/bin/rm -f Makefile
-	$(TOP)/util/point.sh Makefile.ssl Makefile ;
-	$(TOP)/util/mklink.sh ../../include $(EXHEADER)
-	$(TOP)/util/mklink.sh ../../test $(TEST)
-	$(TOP)/util/mklink.sh ../../apps $(APPS)
+links: $(EXHEADER)
+	@$(TOP)/util/point.sh Makefile.ssl Makefile
+	@$(TOP)/util/mklink.sh ../../include $(EXHEADER)
+	@$(TOP)/util/mklink.sh ../../test $(TEST)
+	@$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
@@ -79,18 +68,85 @@ lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-	$(MAKEDEPEND) $(INCLUDES) $(CTX_SIZE).c $(LIBSRC)
+	$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
 
 dclean:
-	perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	/bin/rm -f $(CTX_SIZE) *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
-errors:
-	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # SPECIAL CASE .org
-	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
-	perl ../err/err_genc.pl $(ERR).h $(ERRC).c
+errors: $(ERRC).c
+
+$(ERRC).c: $(ERR).err
+	$(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+	$(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+pem_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
+pem_all.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
+pem_all.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
+pem_all.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
+pem_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
+pem_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+pem_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
+pem_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
+pem_all.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
+pem_all.o: pem.h pem2.h
+pem_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
+pem_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
+pem_err.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
+pem_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
+pem_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
+pem_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+pem_err.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+pem_err.o: ../../include/x509.h ../../include/x509_vfy.h ../crypto.h
+pem_err.o: ../opensslv.h pem.h pem2.h
+pem_info.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_info.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
+pem_info.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
+pem_info.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
+pem_info.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
+pem_info.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
+pem_info.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+pem_info.o: ../../include/ripemd.h ../../include/rsa.h
+pem_info.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+pem_info.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+pem_info.o: ../crypto.h ../opensslv.h pem.h pem2.h
+pem_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
+pem_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
+pem_lib.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
+pem_lib.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
+pem_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
+pem_lib.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
+pem_lib.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+pem_lib.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+pem_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+pem_lib.o: ../crypto.h ../opensslv.h pem.h pem2.h
+pem_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
+pem_seal.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
+pem_seal.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
+pem_seal.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
+pem_seal.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
+pem_seal.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
+pem_seal.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+pem_seal.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+pem_seal.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+pem_seal.o: ../crypto.h ../opensslv.h pem.h pem2.h
+pem_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
+pem_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
+pem_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
+pem_sign.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
+pem_sign.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
+pem_sign.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
+pem_sign.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
+pem_sign.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
+pem_sign.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
+pem_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+pem_sign.o: ../crypto.h ../opensslv.h pem.h pem2.h