summaryrefslogtreecommitdiff
path: root/source4/auth/credentials/config.mk
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-20 08:03:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-20 08:03:35 +1000
commit343fea32ccd205c68b23ee894a8ab4f9413af746 (patch)
tree692412a9e06c8947a84aef39d3def68d74774c13 /source4/auth/credentials/config.mk
parent38c68f1d5bf972f2473a41bf15c4a54efdc38b7e (diff)
parentd817b435342956295f0a31b91203d1a63ae12063 (diff)
downloadsamba-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/auth/credentials/config.mk')
-rw-r--r--source4/auth/credentials/config.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 6f3ec3997c..d71a8238a5 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -1,18 +1,20 @@
#################################
# Start SUBSYSTEM CREDENTIALS
[SUBSYSTEM::CREDENTIALS]
-PRIVATE_PROTO_HEADER = credentials_proto.h
PUBLIC_DEPENDENCIES = \
LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI
PRIVATE_DEPENDENCIES = \
SECRETS
-CREDENTIALS_OBJ_FILES = $(addprefix auth/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
-PUBLIC_HEADERS += auth/credentials/credentials.h
+CREDENTIALS_OBJ_FILES = $(addprefix $(authsrcdir)/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
+
+$(eval $(call proto_header_template,$(authsrcdir)/credentials/credentials_proto.h,$(CREDENTIALS_OBJ_FILES:.o=.c)))
+
+PUBLIC_HEADERS += $(authsrcdir)/credentials/credentials.h
[PYTHON::swig_credentials]
PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
SWIG_FILE = credentials.i
-swig_credentials_OBJ_FILES = auth/credentials/credentials_wrap.o
+swig_credentials_OBJ_FILES = $(authsrcdir)/credentials/credentials_wrap.o