diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
| commit | be14efbdf9de964d36b1fdbc8dec909ad1d2601f (patch) | |
| tree | d46a633b29a0d0f3e1096b21f5da69f611d506e7 /source4/auth | |
| parent | 277287114679addc2ef26fbe6a82963f9cf1b196 (diff) | |
| download | samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.gz samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.xz samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.zip | |
Revert Jelmer's CFLAGS commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c
This commit broke the build, because not all files (libreplace, popt)
were updated.
Andrew Bartlett
(This used to be commit 3faacf4351d68a10aea78b53768571d2059772ae)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/config.mk | 1 | ||||
| -rw-r--r-- | source4/auth/credentials/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.mk | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index b825c520ed8..f13c2e57589 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -27,7 +27,6 @@ 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 03195d77c4e..2eeeec20ecf 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 b563481e4a9..f08ff2638a5 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -26,7 +26,6 @@ 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 @@ -38,7 +37,6 @@ 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 6f06b6298c4..951e247258d 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -14,7 +14,5 @@ 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))) |