Fix the mess with ldb includes.

[metze/samba/wip.git] / source4 / libcli / ldap / config.mk

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 888590ec5ef306479f553bbff142aa348f87f2b8..2708c66b68dc84984a66672141561037748d4950 100644 (file)
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,10 +1,18 @@
-#################################
-# Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
-ADD_OBJ_FILES = libcli/ldap/ldap.o \
-               libcli/ldap/ldap_client.o \
-               libcli/ldap/ldap_ldif.o \
-               libcli/ldap/ldap_ndr.o
-NOPROTO=YES
-# End SUBSYSTEM LIBCLI_LDAP
-#################################
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTEVENT LIBPACKET
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS ASN1_UTIL \
+                                          LDAP_ENCODE LIBNDR LP_RESOLVE gensec
+
+LIBCLI_LDAP_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
+                                          ldap.o ldap_client.o ldap_bind.o \
+                                          ldap_msg.o ldap_ildap.o ldap_controls.o)
+
+
+PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap.h $(libclisrcdir)/ldap/ldap_ndr.h
+
+$(eval $(call proto_header_template,$(libclisrcdir)/ldap/ldap_proto.h,$(LIBCLI_LDAP_OBJ_FILES:.o=.c)))
+
+[SUBSYSTEM::LDAP_ENCODE]
+PRIVATE_DEPENDENCIES = LIBLDB
+
+LDAP_ENCODE_OBJ_FILES = $(libclisrcdir)/ldap/ldap_ndr.o