From 39f50afc579f208300c3c1fcc612ca9b69bb76e3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 30 May 2008 02:07:28 +0200 Subject: Move CFLAGS handling out of smb_build. (This used to be commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c) --- source4/auth/config.mk | 1 + source4/auth/credentials/config.mk | 2 +- source4/auth/gensec/config.mk | 2 ++ source4/auth/kerberos/config.mk | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/auth') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index f13c2e57589..b825c520ed8 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -27,6 +27,7 @@ PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) +$(auth_sam_OBJ_FILES): CFLAGS+=$(LDB_CFLAGS) $(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES:.o=.c))) diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 2eeeec20ecf..03195d77c4e 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -6,8 +6,8 @@ PUBLIC_DEPENDENCIES = \ PRIVATE_DEPENDENCIES = \ SECRETS - CREDENTIALS_OBJ_FILES = $(addprefix $(authsrcdir)/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o) +$(CREDENTIALS_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS) $(eval $(call proto_header_template,$(authsrcdir)/credentials/credentials_proto.h,$(CREDENTIALS_OBJ_FILES:.o=.c))) diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index f08ff2638a5..b563481e4a9 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -26,6 +26,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth_session auth_sam ################################################ gensec_krb5_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_krb5.o) +$(gensec_krb5_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS) ################################################ # Start MODULE gensec_gssapi @@ -37,6 +38,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS ################################################ gensec_gssapi_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_gssapi.o) +$(gensec_gssapi_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS) ################################################ # Start MODULE cyrus_sasl diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index 951e247258d..6f06b6298c4 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -14,5 +14,7 @@ KERBEROS_OBJ_FILES = $(addprefix $(authsrcdir)/kerberos/, \ gssapi_parse.o \ krb5_init_context.o) +$(KERBEROS_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/hx509 + $(eval $(call proto_header_template,$(authsrcdir)/kerberos/proto.h,$(KERBEROS_OBJ_FILES:.o=.c))) -- cgit