summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-12 00:05:10 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:07 +0100
commit73f88ad2508c83c48505af96abaa2dfc449f4b40 (patch)
treee461b09c5d046fec0a4024d9346ffc3e50e75d26
parent0b2780a6a424eea9989443d288435b248d653763 (diff)
downloadsamba-73f88ad2508c83c48505af96abaa2dfc449f4b40.tar.gz
samba-73f88ad2508c83c48505af96abaa2dfc449f4b40.tar.bz2
samba-73f88ad2508c83c48505af96abaa2dfc449f4b40.zip
r25931: Add config .mk file for crypto lib.
(This used to be commit 21ab43158f723069dd70fae43d780878c38ead31)
-rw-r--r--source4/lib/basic.mk25
-rw-r--r--source4/lib/crypto/config.mk26
-rw-r--r--source4/torture/local/local.c1
3 files changed, 28 insertions, 24 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index aa1a5df19c..d1ed7ede0d 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -16,30 +16,7 @@ include stream/config.mk
include util/config.mk
include tdr/config.mk
include dbwrap/config.mk
-
-##############################
-# Start SUBSYSTEM LIBCRYPTO
-[SUBSYSTEM::LIBCRYPTO]
-OBJ_FILES = \
- crypto/crc32.o \
- crypto/md5.o \
- crypto/hmacmd5.o \
- crypto/md4.o \
- crypto/arcfour.o \
- crypto/sha1.o \
- crypto/hmacsha1.o
-# End SUBSYSTEM LIBCRYPTO
-##############################
-
-[MODULE::TORTURE_LIBCRYPTO]
-OBJ_FILES = \
- crypto/md4test.o \
- crypto/md5test.o \
- crypto/hmacmd5test.o \
- crypto/sha1test.o \
- crypto/hmacsha1test.o
-SUBSYSTEM = torture
-PRIVATE_DEPENDENCIES = LIBCRYPTO
+include crypto/config.mk
################################################
# Start SUBSYSTEM LIBCOMPRESSION
diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk
new file mode 100644
index 0000000000..f7a8d20604
--- /dev/null
+++ b/source4/lib/crypto/config.mk
@@ -0,0 +1,26 @@
+##############################
+# Start SUBSYSTEM LIBCRYPTO
+[SUBSYSTEM::LIBCRYPTO]
+OBJ_FILES = \
+ crc32.o \
+ md5.o \
+ hmacmd5.o \
+ md4.o \
+ arcfour.o \
+ sha1.o \
+ hmacsha1.o
+# End SUBSYSTEM LIBCRYPTO
+##############################
+
+[MODULE::TORTURE_LIBCRYPTO]
+OBJ_FILES = \
+ md4test.o \
+ md5test.o \
+ hmacmd5test.o \
+ sha1test.o \
+ hmacsha1test.o
+SUBSYSTEM = torture
+PRIVATE_DEPENDENCIES = LIBCRYPTO
+PRIVATE_PROTO_HEADER = test_proto.h
+
+
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index bee9550bc5..432575c990 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -23,6 +23,7 @@
#include "torture/ndr/ndr.h"
#include "torture/ndr/proto.h"
#include "torture/auth/proto.h"
+#include "lib/crypto/test_proto.h"
/* ignore me */ static struct torture_suite *
(*suite_generators[]) (TALLOC_CTX *mem_ctx) =