display_sec: Move to common libcli/security directory.

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

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 40987e37e2f7662085259112039ab6a0dd36ea8a..9d23fe95885a95ec3b611501a02e6c231d61bd8f 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,28 +1,8 @@
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
-[SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-ADD_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]
-ADD_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 security_descriptor.o \
+                                          access_check.o privilege.o sddl.o) \
 
-#################################
-# Start SUBSYSTEM LIB_SECURITY
-[SUBSYSTEM::LIB_SECURITY]
-ADD_OBJ_FILES = libcli/security/security_token.o \
-               libcli/security/security_descriptor.o \
-               libcli/security/dom_sid.o \
-               libcli/security/access_check.o \
-               libcli/security/privilege.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)))