s4:move the sddl code down to the top level

[ira/wip.git] / source4 / libcli / security / config.mk

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 368a56d2b47e1356d0dfffe2f605c5a32bd1c945..21de2ae246e9834da34ba8c6bb465d3830c234a7 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,29 +1,8 @@
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
-[SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
-# End SUBSYSTEM LIB_SECURITY_NDR_HELPER
-#################################
+[SUBSYSTEM::LIBSECURITY]
+PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON
 
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR
-[SUBSYSTEM::LIB_SECURITY_NDR]
-OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
-NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
-# End SUBSYSTEM LIB_SECURITY_NDR
-#################################
+LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \
+                                               security_token.o access_check.o privilege.o \
+                                               create_descriptor.o object_tree.o)
 
-#################################
-# Start SUBSYSTEM LIB_SECURITY
-[SUBSYSTEM::LIB_SECURITY]
-OBJ_FILES = security_token.o \
-               security_descriptor.o \
-               dom_sid.o \
-               access_check.o \
-               privilege.o \
-               sddl.o \
-               ../../librpc/ndr/ndr_sec.o
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR
-# End SUBSYSTEM LIB_SECURITY
-#################################
+$(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c)))