From: Greg Hudson Date: Wed, 29 May 2013 05:20:19 +0000 (-0400) Subject: Fix non-builtin crypto module builds X-Git-Tag: krb5-1.12-alpha1~146 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af0ef9337acb4418e14234aeb50ca37290d6cdbd;p=thirdparty%2Fkrb5.git 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 ebc3200a9f..89f074c10f 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 c703172025..590c902820 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 e0e3fa5d6f..5a292e1883 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 4bcc193a28..26d9859a95 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 01e30f3d32..89f074c10f 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 22a101902c..4b56e6bb68 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 ce689e6e38..15406f10c7 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 d2bde76cd1..69438f6d60 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 94d10b9abc..cab3c60000 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 536cc9b34e..69a03d50e8 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 f68710e4f6..4b56e6bb68 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@