Move DRSUAPI per-attribute decryption into a common file

[samba.git] / source4 / dsdb / config.mk

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 716068e1777b504c886e379ba7b199a563e37ff9..0895a1dd86696c5bb23c364b1f79363242df6935 100644 (file)
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -1,53 +1,66 @@
 # Directory Service subsystem
 
-include samdb/ldb_modules/config.mk
+mkinclude samdb/ldb_modules/config.mk
 
 ################################################
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
-PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
-PUBLIC_HEADERS = samdb/samdb.h
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
+PRIVATE_DEPENDENCIES = LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
                                           auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
-                                          SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON
-OBJ_FILES = \
+                                          SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON \
+                                               LIBCLI_DRSUAPI
+
+
+SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \
                samdb/samdb.o \
                samdb/samdb_privilege.o \
                samdb/cracknames.o \
-               repl/replicated_objects.o
+               repl/replicated_objects.o)
+
+$(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/samdb_proto.h,$(SAMDB_OBJ_FILES:.o=.c)))
+# PUBLIC_HEADERS += dsdb/samdb/samdb.h
 
 [SUBSYSTEM::SAMDB_COMMON]
-PUBLIC_PROTO_HEADER = common/proto.h
 PRIVATE_DEPENDENCIES = LIBLDB
-OBJ_FILES = \
-               common/sidmap.o \
-               common/flag_mapping.o \
-               common/util.o
+
+SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
+               sidmap.o \
+               flag_mapping.o \
+               util.o)
+$(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::SAMDB_SCHEMA]
-PUBLIC_PROTO_HEADER = schema/proto.h
-PUBLIC_HEADERS = schema/schema.h
-PRIVATE_DEPENDENCIES = SAMDB_COMMON
-OBJ_FILES = \
-               schema/schema_init.o \
-               schema/schema_syntax.o \
-               schema/schema_constructed.o \
+PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
+
+SAMDB_SCHEMA_OBJ_FILES = $(addprefix $(dsdbsrcdir)/schema/, \
+               schema_init.o \
+               schema_set.o \
+               schema_query.o \
+               schema_syntax.o \
+               schema_description.o \
+               schema_convert_to_ol.o \
+               schema_inferiors.o)
+
+$(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
-OBJ_FILES = \
-               repl/drepl_service.o \
-               repl/drepl_periodic.o \
-               repl/drepl_partitions.o \
-               repl/drepl_out_pull.o \
-               repl/drepl_out_helpers.o
-PRIVATE_PROTO_HEADER = repl/drepl_service_proto.h
 PRIVATE_DEPENDENCIES = \
                SAMDB \
                process_model 
 # End SUBSYSTEM DREPL_SRV
 #######################
+
+DREPL_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/repl/, \
+               drepl_service.o \
+               drepl_periodic.o \
+               drepl_partitions.o \
+               drepl_out_pull.o \
+               drepl_out_helpers.o)
+
+$(eval $(call proto_header_template,$(dsdbsrcdir)/repl/drepl_service_proto.h,$(DREPL_SRV_OBJ_FILES:.o=.c)))