diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/lib/crypto/config.mk | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/lib/crypto/config.mk')
-rw-r--r-- | source4/lib/crypto/config.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk deleted file mode 100644 index ee111bd088..0000000000 --- a/source4/lib/crypto/config.mk +++ /dev/null @@ -1,18 +0,0 @@ -############################## -# Start SUBSYSTEM LIBCRYPTO -[SUBSYSTEM::LIBCRYPTO] -# End SUBSYSTEM LIBCRYPTO -############################## - -LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \ - crc32.o md5.o hmacmd5.o md4.o \ - arcfour.o sha256.o hmacsha256.o) - -[MODULE::TORTURE_LIBCRYPTO] -SUBSYSTEM = smbtorture -PRIVATE_DEPENDENCIES = LIBCRYPTO - -TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \ - md4test.o md5test.o hmacmd5test.o) - -$(eval $(call proto_header_template,$(libcryptosrcdir)/test_proto.h,$(TORTURE_LIBCRYPTO_OBJ_FILES:.o=.c))) |