Move libcli/auth to the top level

diff --git a/libcli/auth/config.mk b/libcli/auth/config.mk
new file mode 100644 (file)
index 0000000..c09d163
--- /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
similarity index 100%
rename from source4/libcli/auth/credentials.c
rename to libcli/auth/credentials.c

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

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

diff --git a/source4/auth/ntlm/ntlm_check.c b/libcli/auth/ntlm_check.c
similarity index 100%
rename from source4/auth/ntlm/ntlm_check.c
rename to libcli/auth/ntlm_check.c

diff --git a/source4/libcli/auth/session.c b/libcli/auth/session.c
similarity index 100%
rename from source4/libcli/auth/session.c
rename to libcli/auth/session.c

diff --git a/source4/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
similarity index 100%
rename from source4/libcli/auth/smbdes.c
rename to libcli/auth/smbdes.c

diff --git a/source4/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
similarity index 100%
rename from source4/libcli/auth/smbencrypt.c
rename to libcli/auth/smbencrypt.c

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
deleted file mode 100644 (file)
index 498c2af..0000000
--- 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 5b50bdfcbec2a8b793a5b652305bf6f714de25eb..ad7bc311c296307356aca10e95ccf39395c1a48e 100644 (file)
--- 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 d7db0580e97caaff8d2f360f0ee71849c29bf340..f4314e37422dbd20779f7f88daeed424d5759ef6 100644 (file)
--- 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