summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-24 12:13:41 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-24 17:55:39 +0100
commit536318549fba35a4d9eb60fbb2d0e91b88c44a7b (patch)
tree5e72bf3b9dffd795adacc014b8d238a5fd7c9c53
parent1ab9c1a40290fbecf8b7090492363eab0443c7c6 (diff)
downloadsamba-536318549fba35a4d9eb60fbb2d0e91b88c44a7b.tar.gz
samba-536318549fba35a4d9eb60fbb2d0e91b88c44a7b.tar.bz2
samba-536318549fba35a4d9eb60fbb2d0e91b88c44a7b.zip
libcli/ldap: move ldap_message.[ch] from source4/ to the toplevel
metze
-rw-r--r--libcli/ldap/config.mk7
-rw-r--r--libcli/ldap/ldap_message.c (renamed from source4/libcli/ldap/ldap_message.c)3
-rw-r--r--libcli/ldap/ldap_message.h (renamed from source4/libcli/ldap/ldap_message.h)0
-rw-r--r--source4/headermap.txt2
-rw-r--r--source4/libcli/ldap/config.mk8
-rw-r--r--source4/libcli/ldap/ldap.h2
-rw-r--r--source4/main.mk2
7 files changed, 12 insertions, 12 deletions
diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
new file mode 100644
index 0000000000..067b6778b7
--- /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
index d8bbf42634..e8ec716e64 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
index 47ee724e97..47ee724e97 100644
--- a/source4/libcli/ldap/ldap_message.h
+++ b/libcli/ldap/ldap_message.h
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 8a968315bf..9d8e698f5c 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 a0e178ac40..a1f34a6513 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 a642e671e6..79cfef2128 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 04f7a36a5f..ee2018fb69 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
+