X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2FMakefile.ssl;h=612241536381f4c45b57a37d13423e31c7faed1d;hb=6e6acfd4b92b089661096617de0230c07254c7fa;hp=a0c972276c30e559eb2094a4f7325f1746fa99a6;hpb=99aab1619f02b184f140150c72276bf55716cc42;p=openssl.git

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index a0c972276c..6122415363 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -20,8 +20,6 @@ EX_LIBS=
  
 CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS="\"$(CC) $(CFLAG)\"" -DPLATFORM="\"$(PLATFORM)\""
 
-ERR=crypto
-ERRC=cpt_err
 
 LIBS=
 
@@ -34,12 +32,12 @@ SDIRS=	md2 md5 sha mdc2 hmac ripemd \
 GENERAL=Makefile README
 
 LIB= $(TOP)/libcrypto.a
-LIBSRC=	cryptlib.c mem.c cversion.c ex_data.c tmdiff.c $(ERRC).c
-LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o
+LIBSRC=	cryptlib.c mem.c cversion.c ex_data.c tmdiff.c cpt_err.c
+LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o cpt_err.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h
+EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h
 HEADER=	cryptlib.h date.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -56,7 +54,7 @@ subdirs:
 	@for i in $(SDIRS) ;\
 	do \
 	(cd $$i && echo "making all 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}' all ) || exit 1; \
+	$(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}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
 	done;
 
 files:
@@ -69,9 +67,9 @@ files:
 
 links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
-	@$(TOP)/util/mklink.sh ../include $(HEADER)
-	@$(TOP)/util/mklink.sh ../test $(TEST)
-	@$(TOP)/util/mklink.sh ../apps $(APPS)
+	@$(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+	@$(TOP)/util/mklink.pl ../test $(TEST)
+	@$(TOP)/util/mklink.pl ../apps $(APPS)
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
 	@for i in $(SDIRS); do \
 	(cd $$i; echo "making links in crypto/$$i..."; \
@@ -100,8 +98,8 @@ tests:
 install:
 	@for i in $(EXHEADER) ;\
 	do \
-	(cp $$i $(INSTALLTOP)/include/$$i; \
-	chmod 644 $(INSTALLTOP)/include/$$i ); \
+	(cp $$i $(INSTALLTOP)/include/openssl/$$i; \
+	chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 	@for i in $(SDIRS) ;\
 	do \
@@ -117,11 +115,11 @@ lint:
 	done;
 
 depend:
-	$(MAKEDEPEND) $(INCLUDE) $(PROGS) $(LIBSRC)
+	$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
 	@for i in $(SDIRS) ;\
 	do \
 	(cd $$i; echo "making depend in crypto/$$i..."; \
-	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' depend ); \
+	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
 	done;
 
 clean:
@@ -138,38 +136,35 @@ dclean:
 	@for i in $(SDIRS) ;\
 	do \
 	(cd $$i; echo "making dclean in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
+	$(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
 	done;
 
-errors: errgen $(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
-
-errgen:
-	$(PERL) ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making errors in crypto/$$i..."; \
-	$(MAKE) errors ); \
-	done;
-
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-cpt_err.o: ../include/err.h ../include/stack.h crypto.h opensslv.h
-cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
-cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
-cryptlib.o: opensslv.h
-cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
-cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
-cversion.o: opensslv.h
-ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
-ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h
-ex_data.o: crypto.h opensslv.h
-mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h
-mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h opensslv.h
-tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
-tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h opensslv.h
-tmdiff.o: tmdiff.h
+cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h
+cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/stack.h
+cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+cryptlib.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
+cryptlib.o: date.h
+cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+cversion.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+cversion.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
+cversion.o: date.h
+ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h
+ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ex_data.o: ../include/openssl/stack.h cryptlib.h
+mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
+mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+mem.o: ../include/openssl/stack.h cryptlib.h
+tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
+tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+tmdiff.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/stack.h
+tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h