Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

[ira/wip.git] / source4 / auth / gensec / config.mk

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index b72745daccc9418e36ce3dd37999b3f66390060a..9aab2c704ece2862670fe034756062f9924e3418 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -1,15 +1,14 @@
 #################################
 # Start SUBSYSTEM gensec
 [LIBRARY::gensec]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-DESCRIPTION = Generic Security Library
-RELEASE_VERSION = 1
-PUBLIC_HEADERS = gensec.h
-PRIVATE_PROTO_HEADER = gensec_proto.h
-OBJ_FILES = gensec.o
-REQUIRED_SUBSYSTEMS = \
-               CREDENTIALS
+PC_FILE = gensec.pc
+VERSION = 0.0.1
+SO_VERSION = 0
+PUBLIC_HEADERS = gensec.h spnego.h
+PUBLIC_PROTO_HEADER = gensec_proto.h
+OBJ_FILES = gensec.o socket.o
+PUBLIC_DEPENDENCIES = \
+               CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
 # End SUBSYSTEM gensec
 #################################
 
@@ -19,7 +18,7 @@ REQUIRED_SUBSYSTEMS = \
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
 OBJ_FILES = gensec_krb5.o 
-REQUIRED_SUBSYSTEMS = KERBEROS auth
+PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
@@ -29,18 +28,28 @@ REQUIRED_SUBSYSTEMS = KERBEROS auth
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_gssapi_init
 OBJ_FILES = gensec_gssapi.o 
-REQUIRED_SUBSYSTEMS = KERBEROS auth
+PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS 
 # End MODULE gensec_gssapi
 ################################################
 
+################################################
+# Start MODULE cyrus_sasl
+[MODULE::cyrus_sasl]
+SUBSYSTEM = gensec
+INIT_FUNCTION = gensec_sasl_init
+OBJ_FILES = cyrus_sasl.o 
+PRIVATE_DEPENDENCIES = CREDENTIALS SASL 
+# End MODULE cyrus_sasl
+################################################
+
 ################################################
 # Start MODULE gensec_spnego
 [MODULE::gensec_spnego]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_spnego_init
 PRIVATE_PROTO_HEADER = spnego_proto.h
-OBJ_FILES = spnego.o \
-                       spnego_parse.o
+PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS
+OBJ_FILES = spnego.o spnego_parse.o
 # End MODULE gensec_spnego
 ################################################
 
@@ -52,7 +61,8 @@ PRIVATE_PROTO_HEADER = schannel_proto.h
 INIT_FUNCTION = gensec_schannel_init
 OBJ_FILES = schannel.o \
                        schannel_sign.o
-REQUIRED_SUBSYSTEMS = auth SCHANNELDB NDR_SCHANNEL
+PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR
+OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_schannel
 ################################################
 
@@ -62,6 +72,7 @@ REQUIRED_SUBSYSTEMS = auth SCHANNELDB NDR_SCHANNEL
 PRIVATE_PROTO_HEADER = schannel_state.h
 OBJ_FILES = \
                schannel_state.o
+PRIVATE_DEPENDENCIES = LDB_WRAP SAMDB
 #
 # End SUBSYSTEM SCHANNELDB
 ################################################