summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
commit602f4635da0935abffdda2a29ec302a775fdbe62 (patch)
tree9629af40ff9f530b43578d0e40f3e83a2be43cfc /source4/auth
parent6e0522c3cae9c99b589db67727ee1256c6da82ef (diff)
downloadsamba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.gz
samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.bz2
samba-602f4635da0935abffdda2a29ec302a775fdbe62.zip
Get rid of 'INTEGRATED' build of modules - now replaced by 'MERGED_OBJ'
(This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/gensec/config.mk2
-rw-r--r--source4/auth/ntlmssp/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index a53dff8bfe..9aab2c704e 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -62,7 +62,7 @@ INIT_FUNCTION = gensec_schannel_init
OBJ_FILES = schannel.o \
schannel_sign.o
PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
# End MODULE gensec_schannel
################################################
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 544850264a..9033384b1f 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -13,6 +13,6 @@ OBJ_FILES = ntlmssp.o \
ntlmssp_client.o \
ntlmssp_server.o
PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
# End MODULE gensec_ntlmssp
################################################