Skip to content

Commit

Permalink
Fix non-builtin crypto module builds
Browse files Browse the repository at this point in the history
Commit 4b0985f 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.
  • Loading branch information
greghudson committed May 29, 2013
1 parent f3458ed commit af0ef93
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 24 deletions.
4 changes: 4 additions & 0 deletions src/lib/crypto/nss/aes/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/nss/camellia/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
9 changes: 1 addition & 8 deletions src/lib/crypto/nss/md5/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@

4 changes: 4 additions & 0 deletions src/lib/crypto/nss/sha1/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
14 changes: 2 additions & 12 deletions src/lib/crypto/nss/sha2/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
8 changes: 4 additions & 4 deletions src/lib/crypto/openssl/aes/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/openssl/camellia/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/openssl/md4/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/openssl/md5/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/openssl/sha1/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
4 changes: 4 additions & 0 deletions src/lib/crypto/openssl/sha2/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@

0 comments on commit af0ef93

Please sign in to comment.