diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 17:22:58 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 17:22:58 +0200 |
commit | e9017ba418202b4b191c5a9ad4a96857558ce606 (patch) | |
tree | 7a5069a59fde6de060a8946fa1b04a22333b3078 /source4/smb_server | |
parent | ffc5cbfe803326a1c3bf55684717af910d091c5a (diff) | |
download | samba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.gz samba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.bz2 samba-e9017ba418202b4b191c5a9ad4a96857558ce606.zip |
Use _OBJ_FILES variables in a couple more places.
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
Diffstat (limited to 'source4/smb_server')
-rw-r--r-- | source4/smb_server/config.mk | 16 | ||||
-rw-r--r-- | source4/smb_server/smb/config.mk | 14 | ||||
-rw-r--r-- | source4/smb_server/smb2/config.mk | 14 |
3 files changed, 25 insertions, 19 deletions
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk index 85c969df59..8b6ae308f9 100644 --- a/source4/smb_server/config.mk +++ b/source4/smb_server/config.mk @@ -3,19 +3,14 @@ [MODULE::SERVICE_SMB] INIT_FUNCTION = server_service_smb_init SUBSYSTEM = service -OBJ_FILES = smb_server.o PRIVATE_PROTO_HEADER = service_smb_proto.h PRIVATE_DEPENDENCIES = SMB_SERVER +SERVICE_SMB_OBJ_FILES = smb_server/smb_server.o + ####################### # Start SUBSYSTEM SMB [SUBSYSTEM::SMB_SERVER] -OBJ_FILES = \ - handle.o \ - tcon.o \ - session.o \ - blob.o \ - management.o PRIVATE_PROTO_HEADER = smb_server_proto.h PUBLIC_DEPENDENCIES = \ share \ @@ -25,5 +20,12 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SMB ####################### +SMB_SERVER_OBJ_FILES = $(addprefix smb_server/, \ + handle.o \ + tcon.o \ + session.o \ + blob.o \ + management.o) + mkinclude smb/config.mk mkinclude smb2/config.mk diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk index 7927f295b9..3d4aa8ba38 100644 --- a/source4/smb_server/smb/config.mk +++ b/source4/smb_server/smb/config.mk @@ -2,7 +2,12 @@ # Start SUBSYSTEM SMB_PROTOCOL [SUBSYSTEM::SMB_PROTOCOL] PRIVATE_PROTO_HEADER = smb_proto.h -OBJ_FILES = \ +PUBLIC_DEPENDENCIES = \ + ntvfs LIBPACKET CREDENTIALS +# End SUBSYSTEM SMB_PROTOCOL +####################### + +SMB_PROTOCOL_OBJ_FILES = $(addprefix smb_server/smb/, \ receive.o \ negprot.o \ nttrans.o \ @@ -13,8 +18,5 @@ OBJ_FILES = \ sesssetup.o \ srvtime.o \ trans2.o \ - signing.o -PUBLIC_DEPENDENCIES = \ - ntvfs LIBPACKET CREDENTIALS -# End SUBSYSTEM SMB_PROTOCOL -####################### + signing.o) + diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk index d5ba43b3a8..c9ba3269fa 100644 --- a/source4/smb_server/smb2/config.mk +++ b/source4/smb_server/smb2/config.mk @@ -2,7 +2,12 @@ # Start SUBSYSTEM SMB2_PROTOCOL [SUBSYSTEM::SMB2_PROTOCOL] PRIVATE_PROTO_HEADER = smb2_proto.h -OBJ_FILES = \ +PUBLIC_DEPENDENCIES = \ + ntvfs LIBPACKET LIBCLI_SMB2 +# End SUBSYSTEM SMB2_PROTOCOL +####################### + +SMB2_PROTOCOL_OBJ_FILES = $(addprefix smb_server/smb2/, \ receive.o \ negprot.o \ sesssetup.o \ @@ -10,8 +15,5 @@ OBJ_FILES = \ fileio.o \ fileinfo.o \ find.o \ - keepalive.o -PUBLIC_DEPENDENCIES = \ - ntvfs LIBPACKET LIBCLI_SMB2 -# End SUBSYSTEM SMB2_PROTOCOL -####################### + keepalive.o) + |