diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
| commit | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch) | |
| tree | 138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/smb_server | |
| parent | 1131d4c2545355ef793e468810655c0f72828368 (diff) | |
| parent | b136033421eb045b28f5928e4d2f9604cf704690 (diff) | |
| download | samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2 samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/config.mk | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/config.mk | 1 | ||||
| -rw-r--r-- | source4/smb_server/smb2/config.mk | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk index f21336ae69..85c969df59 100644 --- a/source4/smb_server/config.mk +++ b/source4/smb_server/config.mk @@ -25,5 +25,5 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SMB ####################### -include smb/config.mk -include smb2/config.mk +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 ddadc29ddb..7927f295b9 100644 --- a/source4/smb_server/smb/config.mk +++ b/source4/smb_server/smb/config.mk @@ -16,6 +16,5 @@ OBJ_FILES = \ signing.o PUBLIC_DEPENDENCIES = \ ntvfs LIBPACKET CREDENTIALS -LDFLAGS = $(SMB_SERVER_OUTPUT) # End SUBSYSTEM SMB_PROTOCOL ####################### diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk index b7d7cdc282..d5ba43b3a8 100644 --- a/source4/smb_server/smb2/config.mk +++ b/source4/smb_server/smb2/config.mk @@ -13,6 +13,5 @@ OBJ_FILES = \ keepalive.o PUBLIC_DEPENDENCIES = \ ntvfs LIBPACKET LIBCLI_SMB2 -LDFLAGS = $(SMB_SERVER_OUTPUT) # End SUBSYSTEM SMB2_PROTOCOL ####################### |