sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Use variables for source directory in a couple more places.

Browse Source 
(This used to be commit 2860a7db5968c7007522cdb300eba390da929ab8)
This commit is contained in:
Jelmer Vernooij 2008-05-18 19:46:09 +02:00
parent 4f0db42958
commit 137ec6e340
10 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/auth/config.mk
View File

@ -1,4 +1,5 @@
# auth server subsystem
gensecsrcdir := $(authsrcdir)/gensec
mkinclude gensec/config.mk
mkinclude kerberos/config.mk
mkinclude ntlmssp/config.mk
@ -9,32 +10,32 @@ mkinclude credentials/config.mk
PRIVATE_PROTO_HEADER = session_proto.h
PUBLIC_DEPENDENCIES = CREDENTIALS
PUBLIC_HEADERS += auth/session.h
PUBLIC_HEADERS += $(authsrcdir)/session.h
auth_session_OBJ_FILES = $(addprefix auth/, session.o)
auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o)
[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 auth/, system_session.o)
auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o)
[SUBSYSTEM::auth_sam]
PRIVATE_PROTO_HEADER = auth_sam.h
PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
PRIVATE_DEPENDENCIES = LDAP_ENCODE
auth_sam_OBJ_FILES = $(addprefix auth/, sam.o)
auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o)
[SUBSYSTEM::auth_sam_reply]
PRIVATE_PROTO_HEADER = auth_sam_reply.h
auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o)
auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o)
[PYTHON::swig_auth]
PUBLIC_DEPENDENCIES = auth_system_session
PRIVATE_DEPENDENCIES = SAMDB
SWIG_FILE = auth.i
swig_auth_OBJ_FILES = auth/auth_wrap.o
swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o

18
source4/auth/gensec/config.mk
View File

@ -7,13 +7,13 @@ PUBLIC_DEPENDENCIES = \
# End SUBSYSTEM gensec
#################################
PC_FILES += auth/gensec/gensec.pc
PC_FILES += $(gensecsrcdir)/gensec.pc
gensec_VERSION = 0.0.1
gensec_SOVERSION = 0
gensec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
gensec_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec.o socket.o)
PUBLIC_HEADERS += auth/gensec/gensec.h
PUBLIC_HEADERS += $(gensecsrcdir)/gensec.h
################################################
# Start MODULE gensec_krb5
@ -24,7 +24,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth_session auth_sam
# End MODULE gensec_krb5
################################################
gensec_krb5_OBJ_FILES = $(addprefix auth/gensec/, gensec_krb5.o)
gensec_krb5_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_krb5.o)
################################################
# Start MODULE gensec_gssapi
@ -35,7 +35,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS
# End MODULE gensec_gssapi
################################################
gensec_gssapi_OBJ_FILES = $(addprefix auth/gensec/, gensec_gssapi.o)
gensec_gssapi_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_gssapi.o)
################################################
# Start MODULE cyrus_sasl
@ -46,7 +46,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS SASL
# End MODULE cyrus_sasl
################################################
cyrus_sasl_OBJ_FILES = $(addprefix auth/gensec/, cyrus_sasl.o)
cyrus_sasl_OBJ_FILES = $(addprefix $(gensecsrcdir)/, cyrus_sasl.o)
################################################
# Start MODULE gensec_spnego
@ -58,7 +58,7 @@ PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS
# End MODULE gensec_spnego
################################################
gensec_spnego_OBJ_FILES = $(addprefix auth/gensec/, spnego.o spnego_parse.o)
gensec_spnego_OBJ_FILES = $(addprefix $(gensecsrcdir)/, spnego.o spnego_parse.o)
################################################
# Start MODULE gensec_schannel
@ -71,7 +71,7 @@ OUTPUT_TYPE = MERGED_OBJ
# End MODULE gensec_schannel
################################################
gensec_schannel_OBJ_FILES = $(addprefix auth/gensec/, schannel.o schannel_sign.o)
gensec_schannel_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel.o schannel_sign.o)
################################################
# Start SUBSYSTEM SCHANNELDB
@ -81,5 +81,5 @@ PRIVATE_DEPENDENCIES = LDB_WRAP SAMDB
# End SUBSYSTEM SCHANNELDB
################################################
SCHANNELDB_OBJ_FILES = $(addprefix auth/gensec/, schannel_state.o)
SCHANNELDB_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel_state.o)

2
source4/auth/kerberos/config.mk
View File

@ -7,7 +7,7 @@ PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR
# End SUBSYSTEM KERBEROS
#################################
KERBEROS_OBJ_FILES = $(addprefix auth/kerberos/, \
KERBEROS_OBJ_FILES = $(addprefix $(authsrcdir)/kerberos/, \
kerberos.o \
clikrb5.o \
kerberos_heimdal.o \

18
source4/auth/ntlm/config.mk
View File

@ -3,7 +3,7 @@
[SUBSYSTEM::ntlm_check]
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
ntlm_check_OBJ_FILES = $(addprefix auth/ntlm/, ntlm_check.o)
ntlm_check_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, ntlm_check.o)
#######################
# Start MODULE auth_sam
@ -16,7 +16,7 @@ PRIVATE_DEPENDENCIES = \
# End MODULE auth_sam
#######################
auth_sam_module_OBJ_FILES = $(addprefix auth/ntlm/, auth_sam.o)
auth_sam_module_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_sam.o)
#######################
# Start MODULE auth_anonymous
@ -26,7 +26,7 @@ SUBSYSTEM = auth
# End MODULE auth_anonymous
#######################
auth_anonymous_OBJ_FILES = $(addprefix auth/ntlm/, auth_anonymous.o)
auth_anonymous_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_anonymous.o)
#######################
# Start MODULE auth_anonymous
@ -38,7 +38,7 @@ OUTPUT_TYPE = SHARED_LIBRARY
# End MODULE auth_server
#######################
auth_server_OBJ_FILES = $(addprefix auth/ntlm/, auth_server.o)
auth_server_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_server.o)
#######################
# Start MODULE auth_winbind
@ -49,7 +49,7 @@ PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT
# End MODULE auth_winbind
#######################
auth_winbind_OBJ_FILES = $(addprefix auth/ntlm/, auth_winbind.o)
auth_winbind_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_winbind.o)
#######################
# Start MODULE auth_developer
@ -59,21 +59,21 @@ SUBSYSTEM = auth
# End MODULE auth_developer
#######################
auth_developer_OBJ_FILES = $(addprefix auth/ntlm/, auth_developer.o)
auth_developer_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_developer.o)
[MODULE::auth_unix]
INIT_FUNCTION = auth_unix_init
SUBSYSTEM = auth
PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
auth_unix_OBJ_FILES = $(addprefix auth/ntlm/, auth_unix.o)
auth_unix_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_unix.o)
[SUBSYSTEM::PAM_ERRORS]
PRIVATE_PROTO_HEADER = pam_errors.h
#VERSION = 0.0.1
#SO_VERSION = 0
PAM_ERRORS_OBJ_FILES = $(addprefix auth/ntlm/, pam_errors.o)
PAM_ERRORS_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, pam_errors.o)
[MODULE::auth]
INIT_FUNCTION = server_service_auth_init
@ -81,7 +81,7 @@ SUBSYSTEM = service
PRIVATE_PROTO_HEADER = auth_proto.h
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS
auth_OBJ_FILES = $(addprefix auth/ntlm/, auth.o auth_util.o auth_simple.o)
auth_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth.o auth_util.o auth_simple.o)
# PUBLIC_HEADERS += auth/auth.h

4
source4/auth/ntlmssp/config.mk
View File

@ -1,7 +1,7 @@
[SUBSYSTEM::MSRPC_PARSE]
PRIVATE_PROTO_HEADER = msrpc_parse.h
MSRPC_PARSE_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp_parse.o)
MSRPC_PARSE_OBJ_FILES = $(addprefix $(authsrcdir)/ntlmssp/, ntlmssp_parse.o)
################################################
# Start MODULE gensec_ntlmssp
@ -14,4 +14,4 @@ OUTPUT_TYPE = MERGED_OBJ
# End MODULE gensec_ntlmssp
################################################
gensec_ntlmssp_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o)
gensec_ntlmssp_OBJ_FILES = $(addprefix $((authsrcdir)/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o)

3
source4/cluster/config.mk
View File

@ -1,6 +1,7 @@
ctdbsrcdir = $(clustersrcdir)/ctdb
mkinclude ctdb/config.mk
[SUBSYSTEM::CLUSTER]
PRIVATE_DEPENDENCIES = ctdb
CLUSTER_OBJ_FILES = cluster/cluster.o cluster/local.o
CLUSTER_OBJ_FILES = $(addprefix $(clustersrcdir)/, cluster.o local.o)

6
source4/cluster/ctdb/config.mk
View File

@ -2,19 +2,19 @@
[SUBSYSTEM::brlock_ctdb]
PUBLIC_DEPENDENCIES = ctdb
brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o
brlock_ctdb_OBJ_FILES = $(ctdbsrcdir)/brlock_ctdb.o
##################
[SUBSYSTEM::opendb_ctdb]
PUBLIC_DEPENDENCIES = ctdb
opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o
opendb_ctdb_OBJ_FILES = $(ctdbsrcdir)/opendb_ctdb.o
##################
[SUBSYSTEM::ctdb]
PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC
ctdb_OBJ_FILES = $(addprefix cluster/ctdb/, \
ctdb_OBJ_FILES = $(addprefix $(ctdbsrcdir)/, \
ctdb_cluster.o \
client/ctdb_client.o \
common/ctdb_io.o \

3
source4/main.mk
View File

@ -6,11 +6,14 @@ dsdbsrcdir := dsdb
mkinclude dsdb/config.mk
smbdsrcdir := smbd
mkinclude smbd/config.mk
clustersrcdir := cluster
mkinclude cluster/config.mk
mkinclude smbd/process_model.mk
libnetsrcdir := libnet
mkinclude libnet/config.mk
authsrcdir := auth
mkinclude auth/config.mk
nsswitchsrcdir = nsswitch
mkinclude nsswitch/config.mk
mkinclude lib/basic.mk
paramsrcdir := param

6
source4/nsswitch/config.mk
View File

@ -1,7 +1,7 @@
[SUBSYSTEM::LIBWINBIND-CLIENT]
PRIVATE_DEPENDENCIES = SOCKET_WRAPPER
LIBWINBIND-CLIENT_OBJ_FILES = nsswitch/wb_common.o
LIBWINBIND-CLIENT_OBJ_FILES = $(nsswitchsrcdir)/wb_common.o
#################################
# Start BINARY nsstest
@ -14,7 +14,7 @@ PRIVATE_DEPENDENCIES = \
# End BINARY nsstest
#################################
nsstest_OBJ_FILES = nsswitch/nsstest.o
nsstest_OBJ_FILES = $(nsswitchsrcdir)/nsstest.o
#################################
# Start BINARY wbinfo
@ -31,4 +31,4 @@ PRIVATE_DEPENDENCIES = \
#################################
wbinfo_OBJ_FILES = \
nsswitch/wbinfo.o
$(nsswitchsrcdir)/wbinfo.o

10
source4/smbd/process_model.mk
View File

@ -8,7 +8,7 @@ SUBSYSTEM = process_model
# End MODULE process_model_single
################################################
process_model_single_OBJ_FILES = smbd/process_single.o
process_model_single_OBJ_FILES = $(smbdsrcdir)/process_single.o
################################################
# Start MODULE process_model_standard
@ -19,7 +19,7 @@ PRIVATE_DEPENDENCIES = SETPROCTITLE
# End MODULE process_model_standard
################################################
process_model_standard_OBJ_FILES = smbd/process_standard.o
process_model_standard_OBJ_FILES = $(smbdsrcdir)/process_standard.o
################################################
# Start MODULE process_model_thread
@ -30,7 +30,7 @@ PRIVATE_DEPENDENCIES = PTHREAD
# End MODULE process_model_thread
################################################
process_model_thread_OBJ_FILES = smbd/process_thread.o
process_model_thread_OBJ_FILES = $(smbdsrcdir)/process_thread.o
################################################
# Start MODULE process_model_prefork
@ -40,10 +40,10 @@ SUBSYSTEM = process_model
# End MODULE process_model_thread
################################################
process_model_prefork_OBJ_FILES = smbd/process_prefork.o
process_model_prefork_OBJ_FILES = $(smbdsrcdir)/process_prefork.o
[SUBSYSTEM::process_model]
PRIVATE_PROTO_HEADER = process_model_proto.h
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG
process_model_OBJ_FILES = smbd/process_model.o
process_model_OBJ_FILES = $(smbdsrcdir)/process_model.o