X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Fdsdb%2Fconfig.mk;h=9a1cee979f496159f812b67d1ef8560653667f7f;hb=fd2556317f22ee02b341ca7ebbd02d7197fb1e4d;hp=d2ee92081f6136535f95b876638ccf23a70c84da;hpb=0c6de7c9598889a469084bf15da49b1a2589cff7;p=abartlet%2Fsamba.git%2F.git

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index d2ee92081f6..9a1cee979f4 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -5,57 +5,103 @@ mkinclude samdb/ldb_modules/config.mk
 ################################################
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
-PRIVATE_PROTO_HEADER = samdb/samdb_proto.h
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5  
+PRIVATE_DEPENDENCIES = LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
 					   auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
-					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON
+					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON \
+						LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL 
 
 
-SAMDB_OBJ_FILES = $(addprefix dsdb/, \
+SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
 		repl/replicated_objects.o)
 
-PUBLIC_HEADERS += dsdb/samdb/samdb.h
+$(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/samdb_proto.h,$(SAMDB_OBJ_FILES:.o=.c)))
+# PUBLIC_HEADERS += dsdb/samdb/samdb.h
 
 [SUBSYSTEM::SAMDB_COMMON]
-PRIVATE_PROTO_HEADER = common/proto.h
-PRIVATE_DEPENDENCIES = LIBLDB
+PRIVATE_DEPENDENCIES = LIBLDB NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH
 
-SAMDB_COMMON_OBJ_FILES = $(addprefix dsdb/common/, \
-		sidmap.o \
-		flag_mapping.o \
-		util.o)
+SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
+		util.o \
+		dsdb_dn.o) \
+		../libds/common/flag_mapping.o
+$(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::SAMDB_SCHEMA]
-PRIVATE_PROTO_HEADER = schema/proto.h
-PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
+PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA
 
-SAMDB_SCHEMA_OBJ_FILES = $(addprefix dsdb/schema/, \
+SAMDB_SCHEMA_OBJ_FILES = $(addprefix $(dsdbsrcdir)/schema/, \
 		schema_init.o \
+		schema_set.o \
+		schema_query.o \
 		schema_syntax.o \
-		schema_constructed.o)
+		schema_description.o \
+		schema_convert_to_ol.o \
+		schema_inferiors.o \
+		schema_prefixmap.o)
 
-PUBLIC_HEADERS += dsdb/schema/schema.h
+$(eval $(call proto_header_template,$(dsdbsrcdir)/schema/proto.h,$(SAMDB_SCHEMA_OBJ_FILES:.o=.c)))
+# PUBLIC_HEADERS += dsdb/schema/schema.h
 
 #######################
 # Start SUBSYSTEM DREPL_SRV
 [MODULE::DREPL_SRV]
 INIT_FUNCTION = server_service_drepl_init
 SUBSYSTEM = service
-PRIVATE_PROTO_HEADER = repl/drepl_service_proto.h
 PRIVATE_DEPENDENCIES = \
 		SAMDB \
-		process_model 
+		process_model \
+		RPC_NDR_DRSUAPI
 # End SUBSYSTEM DREPL_SRV
 #######################
 
-DREPL_SRV_OBJ_FILES = $(addprefix dsdb/repl/, \
+DREPL_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/repl/, \
 		drepl_service.o \
 		drepl_periodic.o \
 		drepl_partitions.o \
 		drepl_out_pull.o \
-		drepl_out_helpers.o)
+		drepl_out_helpers.o \
+		drepl_notify.o \
+		drepl_ridalloc.o)
 
+$(eval $(call proto_header_template,$(dsdbsrcdir)/repl/drepl_service_proto.h,$(DREPL_SRV_OBJ_FILES:.o=.c)))
+
+#######################
+# Start SUBSYSTEM KCC_SRV
+[MODULE::KCC_SRV]
+INIT_FUNCTION = server_service_kcc_init
+SUBSYSTEM = service
+PRIVATE_DEPENDENCIES = \
+		SAMDB \
+		process_model \
+		RPC_NDR_DRSUAPI
+# End SUBSYSTEM KCC_SRV
+#######################
+
+KCC_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/kcc/, \
+		kcc_service.o \
+		kcc_connection.o \
+		kcc_topology.o \
+		kcc_deleted.o \
+		kcc_periodic.o \
+		kcc_drs_replica_info.o)
+
+$(eval $(call proto_header_template,$(dsdbsrcdir)/kcc/kcc_service_proto.h,$(KCC_SRV_OBJ_FILES:.o=.c)))
+
+#######################
+# Start SUBSYSTEM DNS_UPDATE_SRV
+[MODULE::DNS_UPDATE_SRV]
+INIT_FUNCTION = server_service_dnsupdate_init
+SUBSYSTEM = service
+PRIVATE_DEPENDENCIES = \
+		SAMDB \
+		process_model \
+		UTIL_RUNCMD
+# End SUBSYSTEM DNS_UPDATE_SRV
+#######################
+
+DNS_UPDATE_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/dns/, \
+		dns_update.o)