diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 20:35:01 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 20:35:01 +0200 |
commit | 08067d22a0cb24fe1b9d6230634aea89c493bd4e (patch) | |
tree | d6421f3eb3c94a27ee99ecf73a7cf31809e5dc09 /source4/smb_server | |
parent | 964257956d4046658c6177a2423c55d2c5bb9f45 (diff) | |
parent | 333c169529a3f64a28fcaff1056069867fd56a90 (diff) | |
download | samba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.tar.gz samba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.tar.bz2 samba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.zip |
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 63fd551a159b3ad4e314f551d65b7d723bbe485a)
Diffstat (limited to 'source4/smb_server')
-rw-r--r-- | source4/smb_server/config.mk | 4 | ||||
-rw-r--r-- | source4/smb_server/smb/config.mk | 2 | ||||
-rw-r--r-- | source4/smb_server/smb2/config.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk index 1e3da1fab6..4b1e523ff7 100644 --- a/source4/smb_server/config.mk +++ b/source4/smb_server/config.mk @@ -6,7 +6,7 @@ SUBSYSTEM = smbd PRIVATE_PROTO_HEADER = service_smb_proto.h PRIVATE_DEPENDENCIES = SMB_SERVER -SERVICE_SMB_OBJ_FILES = smb_server/smb_server.o +SERVICE_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_server.o ####################### # Start SUBSYSTEM SMB @@ -20,7 +20,7 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SMB ####################### -SMB_SERVER_OBJ_FILES = $(addprefix smb_server/, \ +SMB_SERVER_OBJ_FILES = $(addprefix $(smb_serversrcdir)/, \ handle.o \ tcon.o \ session.o \ diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk index 3d4aa8ba38..7e6fce7d7b 100644 --- a/source4/smb_server/smb/config.mk +++ b/source4/smb_server/smb/config.mk @@ -7,7 +7,7 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SMB_PROTOCOL ####################### -SMB_PROTOCOL_OBJ_FILES = $(addprefix smb_server/smb/, \ +SMB_PROTOCOL_OBJ_FILES = $(addprefix $(smb_serversrcdir)/smb/, \ receive.o \ negprot.o \ nttrans.o \ diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk index c9ba3269fa..3a4ebea033 100644 --- a/source4/smb_server/smb2/config.mk +++ b/source4/smb_server/smb2/config.mk @@ -7,7 +7,7 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SMB2_PROTOCOL ####################### -SMB2_PROTOCOL_OBJ_FILES = $(addprefix smb_server/smb2/, \ +SMB2_PROTOCOL_OBJ_FILES = $(addprefix $(smb_serversrcdir)/smb2/, \ receive.o \ negprot.o \ sesssetup.o \ |