From 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 21 Oct 2005 16:29:54 +0000 Subject: r11244: Relative path names in .mk files (This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba) --- source4/auth/config.mk | 26 +++++++++++++++----------- source4/auth/credentials/config.mk | 8 ++++---- source4/auth/gensec/config.mk | 16 ++++++++-------- source4/auth/kerberos/config.mk | 14 +++++++------- source4/auth/ntlmssp/config.mk | 10 +++++----- 5 files changed, 39 insertions(+), 35 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 7e7d4f026d..5c5ec02c93 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -1,4 +1,8 @@ # AUTH Server subsystem +include gensec/config.mk +include kerberos/config.mk +include ntlmssp/config.mk +include credentials/config.mk ####################### # Start MODULE auth_sam @@ -6,7 +10,7 @@ INIT_FUNCTION = auth_sam_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_sam.o + auth_sam.o REQUIRED_SUBSYSTEMS = \ SAMDB # End MODULE auth_sam @@ -18,7 +22,7 @@ REQUIRED_SUBSYSTEMS = \ INIT_FUNCTION = auth_anonymous_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_anonymous.o + auth_anonymous.o # End MODULE auth_anonymous ####################### @@ -28,7 +32,7 @@ INIT_OBJ_FILES = \ INIT_FUNCTION = auth_winbind_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_winbind.o + auth_winbind.o REQUIRED_SUBSYSTEMS = \ LIB_WINBIND_CLIENT \ NDR_NETLOGON NDR_RAW @@ -41,7 +45,7 @@ REQUIRED_SUBSYSTEMS = \ INIT_FUNCTION = auth_domain_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_domain.o + auth_domain.o REQUIRED_SUBSYSTEMS = \ NDR_NETLOGON NDR_RAW # End MODULE auth_winbind @@ -53,7 +57,7 @@ REQUIRED_SUBSYSTEMS = \ INIT_FUNCTION = auth_developer_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_developer.o + auth_developer.o # End MODULE auth_developer ####################### @@ -63,23 +67,23 @@ INIT_OBJ_FILES = \ INIT_FUNCTION = auth_unix_init SUBSYSTEM = AUTH INIT_OBJ_FILES = \ - auth/auth_unix.o + auth_unix.o REQUIRED_SUBSYSTEMS = \ EXT_LIB_CRYPT EXT_LIB_PAM PAM_ERRORS # End MODULE auth_unix ####################### [SUBSYSTEM::PAM_ERRORS] -OBJ_FILES = auth/pam_errors.o +OBJ_FILES = pam_errors.o ####################### # Start SUBSYSTEM AUTH [SUBSYSTEM::AUTH] INIT_OBJ_FILES = \ - auth/auth.o + auth.o ADD_OBJ_FILES = \ - auth/auth_util.o \ - auth/auth_sam_reply.o \ - auth/ntlm_check.o + auth_util.o \ + auth_sam_reply.o \ + ntlm_check.o # End SUBSYSTEM AUTH ####################### diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 74f3f07bef..5e3299784e 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -1,10 +1,10 @@ ################################# # Start SUBSYSTEM GENSEC [SUBSYSTEM::CREDENTIALS] -INIT_OBJ_FILES = auth/credentials/credentials.o -ADD_OBJ_FILES = auth/credentials/credentials_files.o \ - auth/credentials/credentials_krb5.o \ - auth/credentials/credentials_ntlm.o +INIT_OBJ_FILES = credentials.o +ADD_OBJ_FILES = credentials_files.o \ + credentials_krb5.o \ + credentials_ntlm.o REQUIRED_SUBSYSTEMS = \ HEIMDAL # End SUBSYSTEM GENSEC diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 03f7f24848..fe4a5e48e1 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM GENSEC [SUBSYSTEM::GENSEC] INIT_FUNCTION = gensec_init -INIT_OBJ_FILES = auth/gensec/gensec.o +INIT_OBJ_FILES = gensec.o REQUIRED_SUBSYSTEMS = \ SCHANNELDB # End SUBSYSTEM GENSEC @@ -13,7 +13,7 @@ REQUIRED_SUBSYSTEMS = \ [MODULE::gensec_krb5] SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_krb5_init -INIT_OBJ_FILES = auth/gensec/gensec_krb5.o +INIT_OBJ_FILES = gensec_krb5.o REQUIRED_SUBSYSTEMS = KERBEROS AUTH # End MODULE gensec_krb5 ################################################ @@ -23,7 +23,7 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH [MODULE::gensec_gssapi] SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_gssapi_init -INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o +INIT_OBJ_FILES = gensec_gssapi.o REQUIRED_SUBSYSTEMS = KERBEROS AUTH # End MODULE gensec_gssapi ################################################ @@ -33,9 +33,9 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH [MODULE::gensec_spnego] SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_spnego_init -INIT_OBJ_FILES = auth/gensec/spnego.o +INIT_OBJ_FILES = spnego.o ADD_OBJ_FILES = \ - auth/gensec/spnego_parse.o + spnego_parse.o # End MODULE gensec_spnego ################################################ @@ -44,9 +44,9 @@ ADD_OBJ_FILES = \ [MODULE::gensec_schannel] SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_schannel_init -INIT_OBJ_FILES = auth/gensec/schannel.o +INIT_OBJ_FILES = schannel.o ADD_OBJ_FILES = \ - auth/gensec/schannel_sign.o + schannel_sign.o REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB # End MODULE gensec_schannel ################################################ @@ -55,7 +55,7 @@ REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB # Start SUBSYSTEM SCHANNELDB [SUBSYSTEM::SCHANNELDB] INIT_OBJ_FILES = \ - auth/gensec/schannel_state.o + schannel_state.o # # End SUBSYSTEM SCHANNELDB ################################################ diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index cc31af44e7..d3b1a6b0dc 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -1,14 +1,14 @@ ################################# # Start SUBSYSTEM KERBEROS [SUBSYSTEM::KERBEROS] -INIT_OBJ_FILES = auth/kerberos/kerberos.o +INIT_OBJ_FILES = kerberos.o ADD_OBJ_FILES = \ - auth/kerberos/clikrb5.o \ - auth/kerberos/kerberos_verify.o \ - auth/kerberos/kerberos_util.o \ - auth/kerberos/kerberos_pac.o \ - auth/kerberos/gssapi_parse.o \ - auth/kerberos/krb5_init_context.o + clikrb5.o \ + kerberos_verify.o \ + kerberos_util.o \ + kerberos_pac.o \ + gssapi_parse.o \ + krb5_init_context.o REQUIRED_SUBSYSTEMS = KERBEROS_LIB NDR_KRB5PAC # End SUBSYSTEM KERBEROS ################################# diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk index 551c211d71..b4df62872c 100644 --- a/source4/auth/ntlmssp/config.mk +++ b/source4/auth/ntlmssp/config.mk @@ -3,12 +3,12 @@ [MODULE::gensec_ntlmssp] SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_ntlmssp_init -INIT_OBJ_FILES = auth/ntlmssp/ntlmssp.o +INIT_OBJ_FILES = ntlmssp.o ADD_OBJ_FILES = \ - auth/ntlmssp/ntlmssp_parse.o \ - auth/ntlmssp/ntlmssp_sign.o \ - auth/ntlmssp/ntlmssp_client.o \ - auth/ntlmssp/ntlmssp_server.o + ntlmssp_parse.o \ + ntlmssp_sign.o \ + ntlmssp_client.o \ + ntlmssp_server.o REQUIRED_SUBSYSTEMS = AUTH # End MODULE gensec_ntlmssp ################################################ -- cgit