Merge the rest of security.i into samba.dcerpc.security.

[tprouty/samba.git] / source4 / libcli / security / config.mk

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 7faecaf5f2dd172b67a51cc4aacd9ac4a5c545db..4b35841507ae845076b6721d758d726dd6778e47 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]
-ADD_OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
-# End SUBSYSTEM LIB_SECURITY_NDR_HELPER
-#################################
+[SUBSYSTEM::LIBSECURITY]
+PUBLIC_DEPENDENCIES = LIBNDR
 
-#################################
-# 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 \
+                                          dom_sid.o access_check.o privilege.o sddl.o)
 
-#################################
-# Start SUBSYSTEM LIB_SECURITY
-[SUBSYSTEM::LIB_SECURITY]
-ADD_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)))