diff options
author | Greg Hudson <ghudson@mit.edu> | 2013-05-29 01:20:19 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2013-05-29 01:20:19 -0400 |
commit | af0ef9337acb4418e14234aeb50ca37290d6cdbd (patch) | |
tree | f79bc165ad80fbc268e74dd9fc0aa72eb2f62e79 | |
parent | f3458ed803ae97b6c6c7c63baeb82b26c4943d4c (diff) | |
download | krb5-af0ef9337acb4418e14234aeb50ca37290d6cdbd.tar.gz krb5-af0ef9337acb4418e14234aeb50ca37290d6cdbd.tar.xz krb5-af0ef9337acb4418e14234aeb50ca37290d6cdbd.zip |
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.
-rw-r--r-- | src/lib/crypto/nss/aes/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/nss/camellia/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/nss/md5/Makefile.in | 9 | ||||
-rw-r--r-- | src/lib/crypto/nss/sha1/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/nss/sha2/Makefile.in | 14 | ||||
-rw-r--r-- | src/lib/crypto/openssl/aes/Makefile.in | 8 | ||||
-rw-r--r-- | src/lib/crypto/openssl/camellia/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/openssl/md4/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/openssl/md5/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/crypto/openssl/sha1/Makefile.in | 4 | ||||
-rw-r--r-- | 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 ebc3200a9..89f074c10 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 +@libobj_frag@ diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in index c70317202..590c90282 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 +@libobj_frag@ diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in index e0e3fa5d6..5a292e188 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 4bcc193a2..26d9859a9 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 +@libobj_frag@ diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in index 01e30f3d3..89f074c10 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 22a101902..4b56e6bb6 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 +@libobj_frag@ diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in index ce689e6e3..15406f10c 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 +@libobj_frag@ diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in index d2bde76cd..69438f6d6 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 +@libobj_frag@ diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in index 94d10b9ab..cab3c6000 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 +@libobj_frag@ diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in index 536cc9b34..69a03d50e 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 +@libobj_frag@ diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in index f68710e4f..4b56e6bb6 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 +@libobj_frag@ |