diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:09:04 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:09:04 +0200 |
| commit | dc114f8c5acbcffe2f7114083f3e058f17fb4fa2 (patch) | |
| tree | 0d8424597a9635a284f6f8d9af8bb155bc698632 /source4/auth | |
| parent | 333c169529a3f64a28fcaff1056069867fd56a90 (diff) | |
| download | samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.tar.gz samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.tar.bz2 samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.zip | |
Avoid smb_build for prototype headers in some places.
(This used to be commit 4876c4efbbafb4e0afa3554cd9f748ab591a2927)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/config.mk | 11 | ||||
| -rw-r--r-- | source4/auth/credentials/config.mk | 10 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 6 |
3 files changed, 17 insertions, 10 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 28992d1dc1..1f4f8dfb1d 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -7,32 +7,35 @@ mkinclude ntlm/config.mk mkinclude credentials/config.mk [SUBSYSTEM::auth_session] -PRIVATE_PROTO_HEADER = session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PUBLIC_HEADERS += $(authsrcdir)/session.h auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o) +$(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c)) + [SUBSYSTEM::auth_system_session] -PRIVATE_PROTO_HEADER = system_session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) +$(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES)) [SUBSYSTEM::auth_sam] -PRIVATE_PROTO_HEADER = auth_sam.h PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) +$(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES)) + [SUBSYSTEM::auth_sam_reply] -PRIVATE_PROTO_HEADER = auth_sam_reply.h auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) +$(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES)) + [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 6f3ec3997c..02c5b3c55e 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) + +$(call proto_header_template,$(authsrcdir)/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 diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index ddcd8ff458..9a497010a0 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -1,7 +1,6 @@ ################################# # Start SUBSYSTEM gensec [LIBRARY::gensec] -PRIVATE_PROTO_HEADER = gensec_proto.h PUBLIC_DEPENDENCIES = \ CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET # End SUBSYSTEM gensec @@ -15,6 +14,8 @@ gensec_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec.o socket.o) PUBLIC_HEADERS += $(gensecsrcdir)/gensec.h +$(call proto_header_template,$(gensecsrcdir)/gensec_proto.h,$(gensec_OBJ_FILES:.o=.c)) + ################################################ # Start MODULE gensec_krb5 [MODULE::gensec_krb5] @@ -53,13 +54,14 @@ cyrus_sasl_OBJ_FILES = $(addprefix $(gensecsrcdir)/, cyrus_sasl.o) [MODULE::gensec_spnego] SUBSYSTEM = gensec INIT_FUNCTION = gensec_spnego_init -PRIVATE_PROTO_HEADER = spnego_proto.h PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS # End MODULE gensec_spnego ################################################ gensec_spnego_OBJ_FILES = $(addprefix $(gensecsrcdir)/, spnego.o spnego_parse.o) +$(call proto_header_template,$(gensecsrcdir)/spnego_proto.h,$(gensec_spnego_OBJ_FILES:.o=.c)) + ################################################ # Start MODULE gensec_schannel [MODULE::gensec_schannel] |