Fix non-builtin crypto module builds

Commit 4b0985f8573840838bcfa8ec1df3dcd39a3dbf15 went a bit too far in
pruning the placeholder makefiles for the openssl and nss crypto
modules.  We need enough boilerplate to create OBJS.SH in each
directory.

diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in
index ebc3200a9fc8f72fbc3939e1f6880e138d7263f3..89f074c10f3d094259e130ddead7282ec14539dd 100644 (file)
--- a/src/lib/crypto/nss/aes/Makefile.in
+++ b/src/lib/crypto/nss/aes/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in
index c7031720256d74c3955a7aaad6d78fe8b803e384..590c902820d7fa999d5b5ba4f566cfc456d94a84 100644 (file)
--- a/src/lib/crypto/nss/camellia/Makefile.in
+++ b/src/lib/crypto/nss/camellia/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)nss$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index e0e3fa5d6fe33678bedbc072889689ad384ccd54..5a292e18831af12c3d8c4580e7d28eac35e7a8e2 100644 (file)
--- a/src/lib/crypto/nss/md5/Makefile.in
+++ b/src/lib/crypto/nss/md5/Makefile.in
@@ -1,13 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)nss$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-
 all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
 clean-unix:: clean-libobjs
-
 @libobj_frag@
-

diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in
index 4bcc193a28d665061248b7fa87be6df71a9ca286..26d9859a950a7c1a5f8336f6be04479981112b54 100644 (file)
--- a/src/lib/crypto/nss/sha1/Makefile.in
+++ b/src/lib/crypto/nss/sha1/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)nss$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index 01e30f3d3209f1f844ff247b5c999b96bb35c9ab..89f074c10f3d094259e130ddead7282ec14539dd 100644 (file)
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -1,16 +1,6 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
+all-unix:: all-libobjs
 clean-unix:: clean-libobjs
-
 @libobj_frag@

diff --git a/src/lib/crypto/openssl/aes/Makefile.in b/src/lib/crypto/openssl/aes/Makefile.in
index 22a101902c58c46c8793e950cd0ed022b4c16d95..4b56e6bb68b3aed88d40c22ffc438246383aa178 100644 (file)
--- a/src/lib/crypto/openssl/aes/Makefile.in
+++ b/src/lib/crypto/openssl/aes/Makefile.in
@@ -1,6 +1,6 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in
index ce689e6e380ab46e5894fcf496468e0689011259..15406f10c7c36d9fa18251c425e00b37e768e477 100644 (file)
--- a/src/lib/crypto/openssl/camellia/Makefile.in
+++ b/src/lib/crypto/openssl/camellia/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in
index d2bde76cd13c75aab0e1a4914ec895cf9acc937c..69438f6d60c84b2e6b11344d815a7283f841b5d2 100644 (file)
--- a/src/lib/crypto/openssl/md4/Makefile.in
+++ b/src/lib/crypto/openssl/md4/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in
index 94d10b9abcb8abecae7d60fa26cbe8b73083513a..cab3c60000bedb4068bfc4eec5d6f881b459bff2 100644 (file)
--- a/src/lib/crypto/openssl/md5/Makefile.in
+++ b/src/lib/crypto/openssl/md5/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in
index 536cc9b34e471fa13c0bb71743a3fe979ce68c31..69a03d50e8da9a6bc89587c3a89306c4f426e67d 100644 (file)
--- a/src/lib/crypto/openssl/sha1/Makefile.in
+++ b/src/lib/crypto/openssl/sha1/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@

diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in
index f68710e4f6eca38dc8fe2e9d0df85fdce44ec06a..4b56e6bb68b3aed88d40c22ffc438246383aa178 100644 (file)
--- a/src/lib/crypto/openssl/sha2/Makefile.in
+++ b/src/lib/crypto/openssl/sha2/Makefile.in
@@ -1,2 +1,6 @@
+# Placeholder since all crypto modules must have the same structure.
 mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
+@libobj_frag@