diff options
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/config.mk | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index 7b700fda22..d6e007ac58 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -16,6 +16,7 @@ SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \ samdb/samdb_privilege.o \ samdb/cracknames.o \ repl/replicated_objects.o) +$(SAMDB_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/samdb_proto.h,$(SAMDB_OBJ_FILES:.o=.c))) # PUBLIC_HEADERS += dsdb/samdb/samdb.h @@ -29,6 +30,8 @@ SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \ util.o) $(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c))) +$(SAMDB_COMMON_OBJ_FILES): CFLAGS+=$(LDB_CFLAGS) + [SUBSYSTEM::SAMDB_SCHEMA] PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 388b67c6d1..facf7be722 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -155,6 +155,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE \ ################################################ ldb_password_hash_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/password_hash.o +$(ldb_password_hash_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) ################################################ # Start MODULE ldb_local_password @@ -241,49 +242,49 @@ INIT_FUNCTION = LDB_MODULE(update_kt) ################################################ ldb_update_keytab_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/update_keytab.o +$(ldb_update_keytab_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS) ################################################ # Start MODULE ldb_objectclass [MODULE::ldb_objectclass] INIT_FUNCTION = LDB_MODULE(objectclass) OUTPUT_TYPE = SHARED_LIBRARY -CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY NDR_SECURITY SAMDB SUBSYSTEM = LIBLDB # End MODULE ldb_objectclass ################################################ ldb_objectclass_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectclass.o +$(ldb_objectclass_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_subtree_rename [MODULE::ldb_subtree_rename] INIT_FUNCTION = LDB_MODULE(subtree_rename) -CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_subtree_rename ################################################ ldb_subtree_rename_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_rename.o +$(ldb_subtree_rename_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_subtree_rename [MODULE::ldb_subtree_delete] INIT_FUNCTION = LDB_MODULE(subtree_delete) -CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_subtree_rename ################################################ ldb_subtree_delete_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_delete.o +$(ldb_subtree_delete_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_linked_attributes [MODULE::ldb_linked_attributes] INIT_FUNCTION = LDB_MODULE(linked_attributes) -CFLAGS = -Ilib/ldb/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB SUBSYSTEM = LIBLDB @@ -291,24 +292,24 @@ SUBSYSTEM = LIBLDB ################################################ ldb_linked_attributes_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/linked_attributes.o +$(ldb_linked_attributes_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_ranged_results [MODULE::ldb_ranged_results] INIT_FUNCTION = LDB_MODULE(ranged_results) -CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_ranged_results ################################################ ldb_ranged_results_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/ranged_results.o +$(ldb_ranged_results_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_anr [MODULE::ldb_anr] INIT_FUNCTION = LDB_MODULE(anr) -CFLAGS = -Ilib/ldb/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB SUBSYSTEM = LIBLDB @@ -316,12 +317,12 @@ SUBSYSTEM = LIBLDB ################################################ ldb_anr_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/anr.o +$(ldb_anr_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_normalise [MODULE::ldb_normalise] INIT_FUNCTION = LDB_MODULE(normalise) -CFLAGS = -Ilib/ldb/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB SUBSYSTEM = LIBLDB @@ -329,12 +330,12 @@ SUBSYSTEM = LIBLDB ################################################ ldb_normalise_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/normalise.o +$(ldb_normalise_OBJ_FILES): CFLAGS+=-Ilib/ldb/include ################################################ # Start MODULE ldb_instancetype [MODULE::ldb_instancetype] INIT_FUNCTION = LDB_MODULE(instancetype) -CFLAGS = -Ilib/ldb/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB SUBSYSTEM = LIBLDB @@ -342,4 +343,5 @@ SUBSYSTEM = LIBLDB ################################################ ldb_instancetype_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/instancetype.o +$(ldb_instancetype_OBJ_FILES): CFLAGS+=-Ilib/ldb/include |