projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure people know when they need to rebuild the Makefile.
[openssl.git]
/
Makefile.org
diff --git
a/Makefile.org
b/Makefile.org
index a3f51912df5bc5313a1198bdd99d80da91f20a6b..1783db349b09070583438532d95a9dc2c8ca20b2 100644
(file)
--- a/
Makefile.org
+++ b/
Makefile.org
@@
-157,7
+157,7
@@
SDIRS= \
des rc2 rc4 rc5 idea bf cast \
bn rsa dsa dh \
buffer bio stack lhash rand pem err objects \
des rc2 rc4 rc5 idea bf cast \
bn rsa dsa dh \
buffer bio stack lhash rand pem err objects \
- evp asn1 x509 conf txt_db pkcs7 comp
+ evp asn1 x509
x509v3
conf txt_db pkcs7 comp
# If you change the INSTALLTOP, make sure to also change the values
# in crypto/location.h
# If you change the INSTALLTOP, make sure to also change the values
# in crypto/location.h
@@
-184,20
+184,25
@@
WTARFILE= $(NAME)-win.tar
EXHEADER= e_os.h
HEADER= e_os.h
EXHEADER= e_os.h
HEADER= e_os.h
-all:
+all:
Makefile.ssl
@for i in $(DIRS) ;\
do \
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making $$i...";
\
- $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' all ); \
+ (cd $$i
&& echo "making $$i..." &&
\
+ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' all )
|| exit 1
; \
done;
sub_all:
@for i in $(DIRS) ;\
do \
done;
sub_all:
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making $$i...";
\
- $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' all ); \
+ (cd $$i
&& echo "making $$i..." &&
\
+ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' all )
|| exit 1
; \
done;
done;
+Makefile.ssl: Makefile.org
+ @echo "Makefile.ssl is older than Makefile.org. Rerun Configuration"
+ @echo "and do a make links and a make errors."
+ @false
+
libclean:
/bin/rm *.a */lib */*/lib
libclean:
/bin/rm *.a */lib */*/lib
@@
-205,8
+210,8
@@
clean:
/bin/rm -f shlib/*.o *.o core a.out fluff *.map
@for i in $(DIRS) ;\
do \
/bin/rm -f shlib/*.o *.o core a.out fluff *.map
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "cleaning $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' clean ); \
+ (cd $$i
&& echo "cleaning $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' clean )
|| exit 1
; \
/bin/rm -f $(LIBS); \
done;
/bin/rm -f *.a *.o speed.* *.map *.so .pure core
/bin/rm -f $(LIBS); \
done;
/bin/rm -f *.a *.o speed.* *.map *.so .pure core
@@
-224,8
+229,8
@@
files: MINFO
perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
@for i in $(DIRS) ;\
do \
perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making 'files' in $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' files ); \
+ (cd $$i
&& echo "making 'files' in $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' files )
|| exit 1
; \
done;
links:
done;
links:
@@
-234,17
+239,17
@@
links:
$(TOP)/util/mklink.sh include $(EXHEADER)
@for i in $(DIRS) ;\
do \
$(TOP)/util/mklink.sh include $(EXHEADER)
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making links in $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' links ); \
+ (cd $$i
&& echo "making links in $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' links )
|| exit 1
; \
done;
done;
- @(
SSLEAY="`pwd`/apps/ssleay"; export SSLEAY
; sh tools/c_rehash certs)
+ @(
OPENSSL="`pwd`/apps/openssl"; export OPENSSL
; sh tools/c_rehash certs)
dclean:
/bin/rm -f *.bak
@for i in $(DIRS) ;\
do \
dclean:
/bin/rm -f *.bak
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "undoing makedepend in $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' dclean ); \
+ (cd $$i
&& echo "undoing makedepend in $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' dclean )
|| exit 1
; \
done;
rehash:
done;
rehash:
@@
-253,36
+258,36
@@
rehash:
test: tests
tests:
test: tests
tests:
- (cd test
; echo "testing $$i...";
\
+ (cd test
&& echo "testing $$i..." &&
\
$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
- @apps/
ssleay
version -a
+ @apps/
openssl
version -a
depend:
@for i in $(DIRS) ;\
do \
depend:
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making dependancies $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' depend ); \
+ (cd $$i
&& echo "making dependancies $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' depend )
|| exit 1
; \
done;
lint:
@for i in $(DIRS) ;\
do \
done;
lint:
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making lint $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' lint ); \
+ (cd $$i
&& echo "making lint $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' lint )
|| exit 1
; \
done;
tags:
@for i in $(DIRS) ;\
do \
done;
tags:
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making tags $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' tags ); \
+ (cd $$i
&& echo "making tags $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' tags )
|| exit 1
; \
done;
errors:
@for i in $(DIRS) ;\
do \
done;
errors:
@for i in $(DIRS) ;\
do \
- (cd $$i
; echo "making errors in $$i...";
\
- $(MAKE) SDIRS='${SDIRS}' errors ); \
+ (cd $$i
&& echo "making errors in $$i..." &&
\
+ $(MAKE) SDIRS='${SDIRS}' errors )
|| exit 1
; \
done;
tar:
done;
tar: