summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-16 13:26:38 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-04-14 14:19:39 +1000
commit927a8b330435b4c959ad851e32b83d97a6e3001b (patch)
treed8132fa21f60ae83ed7e19d6b07a8345071ed271
parent786447dea021f97a44582009bf33e28d972dacb4 (diff)
downloadsamba-927a8b330435b4c959ad851e32b83d97a6e3001b.tar.gz
samba-927a8b330435b4c959ad851e32b83d97a6e3001b.tar.bz2
samba-927a8b330435b4c959ad851e32b83d97a6e3001b.zip
Move libcli/auth to the top level
-rw-r--r--libcli/auth/config.mk13
-rw-r--r--libcli/auth/credentials.c (renamed from source4/libcli/auth/credentials.c)0
-rw-r--r--libcli/auth/credentials.h (renamed from source4/libcli/auth/credentials.h)0
-rw-r--r--libcli/auth/libcli_auth.h (renamed from source4/libcli/auth/libcli_auth.h)0
-rw-r--r--libcli/auth/ntlm_check.c (renamed from source4/auth/ntlm/ntlm_check.c)0
-rw-r--r--libcli/auth/session.c (renamed from source4/libcli/auth/session.c)0
-rw-r--r--libcli/auth/smbdes.c (renamed from source4/libcli/auth/smbdes.c)0
-rw-r--r--libcli/auth/smbencrypt.c (renamed from source4/libcli/auth/smbencrypt.c)0
-rw-r--r--source4/libcli/auth/config.mk17
-rw-r--r--source4/libcli/config.mk1
-rw-r--r--source4/main.mk1
11 files changed, 14 insertions, 18 deletions
diff --git a/libcli/auth/config.mk b/libcli/auth/config.mk
new file mode 100644
index 0000000000..c09d1631c0
--- /dev/null
+++ b/libcli/auth/config.mk
@@ -0,0 +1,13 @@
+[SUBSYSTEM::LIBCLI_AUTH]
+PUBLIC_DEPENDENCIES = \
+ MSRPC_PARSE \
+ LIBSAMBA-HOSTCONFIG
+
+LIBCLI_AUTH_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, \
+ credentials.o \
+ session.o \
+ smbencrypt.o \
+ smbdes.o)
+
+PUBLIC_HEADERS += ../libcli/auth/credentials.h
+$(eval $(call proto_header_template,$(libclicommonsrcdir)/auth/proto.h,$(LIBCLI_AUTH_OBJ_FILES:.o=.c)))
diff --git a/source4/libcli/auth/credentials.c b/libcli/auth/credentials.c
index 3c77b0836d..3c77b0836d 100644
--- a/source4/libcli/auth/credentials.c
+++ b/libcli/auth/credentials.c
diff --git a/source4/libcli/auth/credentials.h b/libcli/auth/credentials.h
index 4e11cb090f..4e11cb090f 100644
--- a/source4/libcli/auth/credentials.h
+++ b/libcli/auth/credentials.h
diff --git a/source4/libcli/auth/libcli_auth.h b/libcli/auth/libcli_auth.h
index ec1c1e7d98..ec1c1e7d98 100644
--- a/source4/libcli/auth/libcli_auth.h
+++ b/libcli/auth/libcli_auth.h
diff --git a/source4/auth/ntlm/ntlm_check.c b/libcli/auth/ntlm_check.c
index 0805b1b043..0805b1b043 100644
--- a/source4/auth/ntlm/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
diff --git a/source4/libcli/auth/session.c b/libcli/auth/session.c
index 10c728662d..10c728662d 100644
--- a/source4/libcli/auth/session.c
+++ b/libcli/auth/session.c
diff --git a/source4/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
index 32e65e779d..32e65e779d 100644
--- a/source4/libcli/auth/smbdes.c
+++ b/libcli/auth/smbdes.c
diff --git a/source4/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index c6118c6568..c6118c6568 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
deleted file mode 100644
index 498c2af258..0000000000
--- a/source4/libcli/auth/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#################################
-# Start SUBSYSTEM LIBCLI_AUTH
-[SUBSYSTEM::LIBCLI_AUTH]
-PUBLIC_DEPENDENCIES = \
- MSRPC_PARSE \
- LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM LIBCLI_AUTH
-#################################
-
-LIBCLI_AUTH_OBJ_FILES = $(addprefix $(libclisrcdir)/auth/, \
- credentials.o \
- session.o \
- smbencrypt.o \
- smbdes.o)
-
-PUBLIC_HEADERS += $(libclisrcdir)/auth/credentials.h
-$(eval $(call proto_header_template,$(libclisrcdir)/auth/proto.h,$(LIBCLI_AUTH_OBJ_FILES:.o=.c)))
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 5b50bdfcbe..ad7bc311c2 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -1,4 +1,3 @@
-mkinclude auth/config.mk
mkinclude ldap/config.mk
mkinclude security/config.mk
mkinclude wbclient/config.mk
diff --git a/source4/main.mk b/source4/main.mk
index d7db0580e9..f4314e3742 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -53,4 +53,5 @@ mkinclude ../lib/smbconf/config.mk
mkinclude ../lib/async_req/config.mk
mkinclude ../libcli/security/config.mk
mkinclude ../libcli/ldap/config.mk
+mkinclude ../libcli/auth/config.mk