krb5 commit: Fix non-builtin crypto module builds
Greg Hudson
ghudson at MIT.EDU
Wed May 29 01:26:47 EDT 2013
https://github.com/krb5/krb5/commit/af0ef9337acb4418e14234aeb50ca37290d6cdbd
commit af0ef9337acb4418e14234aeb50ca37290d6cdbd
Author: Greg Hudson <ghudson at mit.edu>
Date: Wed May 29 01:20:19 2013 -0400
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.
src/lib/crypto/nss/aes/Makefile.in | 4 ++++
src/lib/crypto/nss/camellia/Makefile.in | 4 ++++
src/lib/crypto/nss/md5/Makefile.in | 9 +--------
src/lib/crypto/nss/sha1/Makefile.in | 4 ++++
src/lib/crypto/nss/sha2/Makefile.in | 14 ++------------
src/lib/crypto/openssl/aes/Makefile.in | 8 ++++----
src/lib/crypto/openssl/camellia/Makefile.in | 4 ++++
src/lib/crypto/openssl/md4/Makefile.in | 4 ++++
src/lib/crypto/openssl/md5/Makefile.in | 4 ++++
src/lib/crypto/openssl/sha1/Makefile.in | 4 ++++
src/lib/crypto/openssl/sha2/Makefile.in | 4 ++++
11 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in
index ebc3200..89f074c 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in
index c703172..590c902 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index e0e3fa5..5a292e1 100644
--- 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 4bcc193..26d9859 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index 01e30f3..89f074c 100644
--- 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 22a1019..4b56e6b 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in
index ce689e6..15406f1 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in
index d2bde76..69438f6 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in
index 94d10b9..cab3c60 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in
index 536cc9b..69a03d5 100644
--- 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
+ at libobj_frag@
diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in
index f68710e..4b56e6b 100644
--- 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
+ at libobj_frag@
More information about the cvs-krb5
mailing list