diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 08:03:35 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 08:03:35 +1000 |
| commit | 343fea32ccd205c68b23ee894a8ab4f9413af746 (patch) | |
| tree | 692412a9e06c8947a84aef39d3def68d74774c13 /source4/lib/crypto/config.mk | |
| parent | 38c68f1d5bf972f2473a41bf15c4a54efdc38b7e (diff) | |
| parent | d817b435342956295f0a31b91203d1a63ae12063 (diff) | |
| download | samba-343fea32ccd205c68b23ee894a8ab4f9413af746.tar.gz samba-343fea32ccd205c68b23ee894a8ab4f9413af746.tar.bz2 samba-343fea32ccd205c68b23ee894a8ab4f9413af746.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Fix config.mk due to changing syntax.
Conflicts:
source/libcli/config.mk
source/nbt_server/config.mk
(This used to be commit 6a1c76f29f78183f44dfac6f468c5e728d2cb2cf)
Diffstat (limited to 'source4/lib/crypto/config.mk')
| -rw-r--r-- | source4/lib/crypto/config.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk index 8e0cba17f0..b9a7f7cb9e 100644 --- a/source4/lib/crypto/config.mk +++ b/source4/lib/crypto/config.mk @@ -4,7 +4,7 @@ # End SUBSYSTEM LIBCRYPTO ############################## -LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \ +LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \ crc32.o md5.o hmacmd5.o md4.o \ arcfour.o sha1.o hmacsha1.o) @@ -12,8 +12,8 @@ LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \ [MODULE::TORTURE_LIBCRYPTO] SUBSYSTEM = smbtorture PRIVATE_DEPENDENCIES = LIBCRYPTO -PRIVATE_PROTO_HEADER = test_proto.h -TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \ +TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \ md4test.o md5test.o hmacmd5test.o sha1test.o hmacsha1test.o) +$(eval $(call proto_header_template,$(libcryptosrcdir)/test_proto.h,$(TORTURE_LIBCRYPTO_OBJ_FILES:.o=.c))) |