From 536318549fba35a4d9eb60fbb2d0e91b88c44a7b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 24 Feb 2009 12:13:41 +0100
Subject: [PATCH] libcli/ldap: move ldap_message.[ch] from source4/ to the
 toplevel

metze
---
 libcli/ldap/config.mk                          | 7 +++++++
 {source4/libcli => libcli}/ldap/ldap_message.c | 3 +--
 {source4/libcli => libcli}/ldap/ldap_message.h | 0
 source4/headermap.txt                          | 2 +-
 source4/libcli/ldap/config.mk                  | 8 --------
 source4/libcli/ldap/ldap.h                     | 2 +-
 source4/main.mk                                | 2 ++
 7 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 libcli/ldap/config.mk
 rename {source4/libcli => libcli}/ldap/ldap_message.c (99%)
 rename {source4/libcli => libcli}/ldap/ldap_message.h (100%)

diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
new file mode 100644
index 00000000000..067b6778b7f
--- /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 d8bbf426342..e8ec716e641 100644
--- 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 8a968315bf9..9d8e698f5cf 100644
--- 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 a0e178ac409..a1f34a65137 100644
--- 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 a642e671e6d..79cfef2128e 100644
--- 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 04f7a36a5f2..ee2018fb694 100644
--- 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
+