This version is slightly better than rev 1.10. There are still missing

dependencies for openssl/*.h.  I cannot reproduce any critical race
conditions with this revision.

1 files changed, 8 insertions, 10 deletions

diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 61b2819..c77ed39 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -15,13 +15,11 @@ CFLAGS+= -DDEVRANDOM=\"/dev/urandom\"
 
 WITH_RSA?= YES
 
-SRCS+=		buildinf.h
-CLEANFILES+=	buildinf.h
+SRCS+=		buildinf.h openssl/opensslconf.h
+CLEANFILES+=	buildinf.h openssl/opensslconf.h
 CLEANDIRS+=	openssl
 
-#	this bogus dependency was the easiest way to get the openssl/ 
-#	directory populated
-buildinf.h:  openssl/opensslconf.h openssl/headers-copied
+buildinf.h:
 	( echo "#ifndef MK1MF_BUILD"; \
 	echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
 	echo "  #define CFLAGS \"$(CC)\""; \
@@ -29,11 +27,11 @@ buildinf.h:  openssl/opensslconf.h openssl/headers-copied
 	echo "  #define DATE \"`LC_TIME=C date`\""; \
 	echo "#endif" ) > ${.TARGET}
 
+#	XXX:  The openssl/ dependencies are not correct, in that a change in
+#	any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
+#	This deficiency will be fixed in a later commit.
+
 openssl/opensslconf.h:  ../libcrypto/opensslconf-${MACHINE_ARCH}.h
-	@mkdir -p openssl
+	mkdir -p openssl
 	cp ${.OODATE} ${.TARGET}
-
-openssl/headers-copied:
-	@mkdir -p openssl
 	${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
-	@touch ${.TARGET}