libcli/ldap: move ldap_message.[ch] from source4/ to the toplevel

metze

diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
new file mode 100644 (file)
index 0000000..067b677
--- /dev/null
+++ b/libcli/ldap/config.mk
@@ -0,0 +1,7 @@
+[SUBSYSTEM::LIBCLI_LDAP_MESSAGE]
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBLDB
+PRIVATE_DEPENDENCIES = ASN1_UTIL
+
+LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix ../libcli/ldap/, \
+                                               ldap_message.o)
+PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h

diff --git a/source4/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
similarity index 99%
rename from source4/libcli/ldap/ldap_message.c
rename to libcli/ldap/ldap_message.c
index d8bbf426342c5c857152cf81a80ede565f756638..e8ec716e64118ebc6a18272b13497fcc43b2f6e8 100644 (file)
--- a/source4/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -24,8 +24,7 @@
 
 #include "includes.h"
 #include "../lib/util/asn1.h"
-#include "libcli/ldap/ldap.h"
-#include "libcli/ldap/ldap_proto.h"
+#include "../libcli/ldap/ldap_message.h"
 
 _PUBLIC_ struct ldap_message *new_ldap_message(TALLOC_CTX *mem_ctx)
 {

diff --git a/source4/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h
similarity index 100%
rename from source4/libcli/ldap/ldap_message.h
rename to libcli/ldap/ldap_message.h

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 8a968315bf901e12b6709142b661974c4d8b7d92..9d8e698f5cfbe11d6ddf9085e9050942660eae5f 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -49,7 +49,7 @@ param/share.h: share.h
 ../lib/util/util_tdb.h: util_tdb.h
 ../lib/util/util_ldb.h: util_ldb.h
 ../lib/util/wrap_xattr.h: wrap_xattr.h
-libcli/ldap/ldap_message.h: ldap_message.h
+../libcli/ldap/ldap_message.h: ldap_message.h
 libcli/ldap/ldap_ndr.h: ldap_ndr.h
 ../lib/tevent/tevent.h: tevent.h
 ../lib/tevent/tevent_internal.h: tevent_internal.h

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index a0e178ac40921a7c048aa4ec0ab0d056c87d7acc..a1f34a651370f9fd0516f47c2092bd31088a3fa5 100644 (file)
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,11 +1,3 @@
-[SUBSYSTEM::LIBCLI_LDAP_MESSAGE]
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBLDB
-PRIVATE_DEPENDENCIES = ASN1_UTIL
-
-LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
-                                               ldap_message.o)
-PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap_message.h
-
 [SUBSYSTEM::LIBCLI_LDAP]
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTEVENT LIBPACKET
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS \

diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index a642e671e6df9c8e97d156d8d3e7b949b54cbc8e..79cfef2128ee402c7c9cfac40871bede87612252 100644 (file)
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -21,7 +21,7 @@
 #ifndef _SMB_LDAP_H_
 #define _SMB_LDAP_H_
 
-#include "libcli/ldap/ldap_message.h"
+#include "../libcli/ldap/ldap_message.h"
 #include "librpc/gen_ndr/misc.h"
 
 struct tevent_context;

diff --git a/source4/main.mk b/source4/main.mk
index 04f7a36a5f26d121a03caae81bd5c28fce482462..ee2018fb694f7dae00683c77eba272f8aac6a6a4 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -50,3 +50,5 @@ mkinclude kdc/config.mk
 mkinclude ../lib/smbconf/config.mk
 mkinclude ../lib/async_req/config.mk
 mkinclude ../libcli/security/config.mk
+mkinclude ../libcli/ldap/config.mk
+