winpr: move to one folder

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24e982..fd27308 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,9 +160,7 @@ add_subdirectory(libfreerdp-channels)
 add_subdirectory(libfreerdp-locale)
 add_subdirectory(libfreerdp-core)
 
-add_subdirectory(libwinpr-crt)
-add_subdirectory(libwinpr-rpc)
-add_subdirectory(libwinpr-sspi)
+add_subdirectory(winpr)
 
 if(NOT WIN32)
        add_subdirectory(channels)

diff --git a/cunit/test_ntlm.c b/cunit/test_ntlm.c
index 3563b4a..77ae5c5 100644 (file)
--- a/cunit/test_ntlm.c
+++ b/cunit/test_ntlm.c
@@ -23,9 +23,9 @@
 #include <winpr/sspi.h>
 #include <freerdp/freerdp.h>
 
-#include "libwinpr-sspi/NTLM/ntlm.h"
-#include "libwinpr-sspi/NTLM/ntlm_compute.h"
-#include "libwinpr-sspi/NTLM/ntlm_message.h"
+#include "winpr/sspi/NTLM/ntlm.h"
+#include "winpr/sspi/NTLM/ntlm_compute.h"
+#include "winpr/sspi/NTLM/ntlm_message.h"
 
 #include "test_ntlm.h"
 

diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8b97901
--- /dev/null
+++ b/winpr/CMakeLists.txt
@@ -0,0 +1,23 @@
+# WinPR: Windows Portable Runtime
+# winpr cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_subdirectory(crt)
+add_subdirectory(rpc)
+add_subdirectory(sspi)
+

diff --git a/libwinpr-crt/CMakeLists.txt b/winpr/crt/CMakeLists.txt
similarity index 100%
rename from libwinpr-crt/CMakeLists.txt
rename to winpr/crt/CMakeLists.txt

diff --git a/libwinpr-crt/memory.c b/winpr/crt/memory.c
similarity index 100%
rename from libwinpr-crt/memory.c
rename to winpr/crt/memory.c

diff --git a/libwinpr-crt/string.c b/winpr/crt/string.c
similarity index 100%
rename from libwinpr-crt/string.c
rename to winpr/crt/string.c

diff --git a/libwinpr-rpc/CMakeLists.txt b/winpr/rpc/CMakeLists.txt
similarity index 99%
rename from libwinpr-rpc/CMakeLists.txt
rename to winpr/rpc/CMakeLists.txt
index af607cb..3978f8a 100644 (file)
--- a/libwinpr-rpc/CMakeLists.txt
+++ b/winpr/rpc/CMakeLists.txt
@@ -47,3 +47,4 @@ endif()
 target_link_libraries(winpr-rpc ${OPENSSL_LIBRARIES})
 
 install(TARGETS winpr-rpc DESTINATION ${CMAKE_INSTALL_LIBDIR})
+

diff --git a/libwinpr-rpc/midl.c b/winpr/rpc/midl.c
similarity index 100%
rename from libwinpr-rpc/midl.c
rename to winpr/rpc/midl.c

diff --git a/libwinpr-rpc/ndr.c b/winpr/rpc/ndr.c
similarity index 100%
rename from libwinpr-rpc/ndr.c
rename to winpr/rpc/ndr.c

diff --git a/libwinpr-rpc/ndr_array.c b/winpr/rpc/ndr_array.c
similarity index 100%
rename from libwinpr-rpc/ndr_array.c
rename to winpr/rpc/ndr_array.c

diff --git a/libwinpr-rpc/ndr_array.h b/winpr/rpc/ndr_array.h
similarity index 100%
rename from libwinpr-rpc/ndr_array.h
rename to winpr/rpc/ndr_array.h

diff --git a/libwinpr-rpc/ndr_context.c b/winpr/rpc/ndr_context.c
similarity index 100%
rename from libwinpr-rpc/ndr_context.c
rename to winpr/rpc/ndr_context.c

diff --git a/libwinpr-rpc/ndr_context.h b/winpr/rpc/ndr_context.h
similarity index 100%
rename from libwinpr-rpc/ndr_context.h
rename to winpr/rpc/ndr_context.h

diff --git a/libwinpr-rpc/ndr_correlation.c b/winpr/rpc/ndr_correlation.c
similarity index 100%
rename from libwinpr-rpc/ndr_correlation.c
rename to winpr/rpc/ndr_correlation.c

diff --git a/libwinpr-rpc/ndr_correlation.h b/winpr/rpc/ndr_correlation.h
similarity index 100%
rename from libwinpr-rpc/ndr_correlation.h
rename to winpr/rpc/ndr_correlation.h

diff --git a/libwinpr-rpc/ndr_pointer.c b/winpr/rpc/ndr_pointer.c
similarity index 100%
rename from libwinpr-rpc/ndr_pointer.c
rename to winpr/rpc/ndr_pointer.c

diff --git a/libwinpr-rpc/ndr_pointer.h b/winpr/rpc/ndr_pointer.h
similarity index 100%
rename from libwinpr-rpc/ndr_pointer.h
rename to winpr/rpc/ndr_pointer.h

diff --git a/libwinpr-rpc/ndr_private.c b/winpr/rpc/ndr_private.c
similarity index 100%
rename from libwinpr-rpc/ndr_private.c
rename to winpr/rpc/ndr_private.c

diff --git a/libwinpr-rpc/ndr_private.h b/winpr/rpc/ndr_private.h
similarity index 100%
rename from libwinpr-rpc/ndr_private.h
rename to winpr/rpc/ndr_private.h

diff --git a/libwinpr-rpc/ndr_simple.c b/winpr/rpc/ndr_simple.c
similarity index 100%
rename from libwinpr-rpc/ndr_simple.c
rename to winpr/rpc/ndr_simple.c

diff --git a/libwinpr-rpc/ndr_simple.h b/winpr/rpc/ndr_simple.h
similarity index 100%
rename from libwinpr-rpc/ndr_simple.h
rename to winpr/rpc/ndr_simple.h

diff --git a/libwinpr-rpc/ndr_string.c b/winpr/rpc/ndr_string.c
similarity index 100%
rename from libwinpr-rpc/ndr_string.c
rename to winpr/rpc/ndr_string.c

diff --git a/libwinpr-rpc/ndr_string.h b/winpr/rpc/ndr_string.h
similarity index 100%
rename from libwinpr-rpc/ndr_string.h
rename to winpr/rpc/ndr_string.h

diff --git a/libwinpr-rpc/ndr_structure.c b/winpr/rpc/ndr_structure.c
similarity index 100%
rename from libwinpr-rpc/ndr_structure.c
rename to winpr/rpc/ndr_structure.c

diff --git a/libwinpr-rpc/ndr_structure.h b/winpr/rpc/ndr_structure.h
similarity index 100%
rename from libwinpr-rpc/ndr_structure.h
rename to winpr/rpc/ndr_structure.h

diff --git a/libwinpr-rpc/ndr_union.c b/winpr/rpc/ndr_union.c
similarity index 100%
rename from libwinpr-rpc/ndr_union.c
rename to winpr/rpc/ndr_union.c

diff --git a/libwinpr-rpc/ndr_union.h b/winpr/rpc/ndr_union.h
similarity index 100%
rename from libwinpr-rpc/ndr_union.h
rename to winpr/rpc/ndr_union.h

diff --git a/libwinpr-rpc/rpc.c b/winpr/rpc/rpc.c
similarity index 100%
rename from libwinpr-rpc/rpc.c
rename to winpr/rpc/rpc.c

diff --git a/libwinpr-sspi/CMakeLists.txt b/winpr/sspi/CMakeLists.txt
similarity index 100%
rename from libwinpr-sspi/CMakeLists.txt
rename to winpr/sspi/CMakeLists.txt

diff --git a/libwinpr-sspi/Kerberos/kerberos.c b/winpr/sspi/Kerberos/kerberos.c
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos.c
rename to winpr/sspi/Kerberos/kerberos.c

diff --git a/libwinpr-sspi/Kerberos/kerberos.h b/winpr/sspi/Kerberos/kerberos.h
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos.h
rename to winpr/sspi/Kerberos/kerberos.h

diff --git a/libwinpr-sspi/Kerberos/kerberos_crypto.c b/winpr/sspi/Kerberos/kerberos_crypto.c
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_crypto.c
rename to winpr/sspi/Kerberos/kerberos_crypto.c

diff --git a/libwinpr-sspi/Kerberos/kerberos_crypto.h b/winpr/sspi/Kerberos/kerberos_crypto.h
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_crypto.h
rename to winpr/sspi/Kerberos/kerberos_crypto.h

diff --git a/libwinpr-sspi/Kerberos/kerberos_decode.c b/winpr/sspi/Kerberos/kerberos_decode.c
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_decode.c
rename to winpr/sspi/Kerberos/kerberos_decode.c

diff --git a/libwinpr-sspi/Kerberos/kerberos_decode.h b/winpr/sspi/Kerberos/kerberos_decode.h
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_decode.h
rename to winpr/sspi/Kerberos/kerberos_decode.h

diff --git a/libwinpr-sspi/Kerberos/kerberos_encode.c b/winpr/sspi/Kerberos/kerberos_encode.c
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_encode.c
rename to winpr/sspi/Kerberos/kerberos_encode.c

diff --git a/libwinpr-sspi/Kerberos/kerberos_encode.h b/winpr/sspi/Kerberos/kerberos_encode.h
similarity index 100%
rename from libwinpr-sspi/Kerberos/kerberos_encode.h
rename to winpr/sspi/Kerberos/kerberos_encode.h

diff --git a/libwinpr-sspi/NTLM/ntlm.c b/winpr/sspi/NTLM/ntlm.c
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm.c
rename to winpr/sspi/NTLM/ntlm.c

diff --git a/libwinpr-sspi/NTLM/ntlm.h b/winpr/sspi/NTLM/ntlm.h
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm.h
rename to winpr/sspi/NTLM/ntlm.h

diff --git a/libwinpr-sspi/NTLM/ntlm_av_pairs.c b/winpr/sspi/NTLM/ntlm_av_pairs.c
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_av_pairs.c
rename to winpr/sspi/NTLM/ntlm_av_pairs.c

diff --git a/libwinpr-sspi/NTLM/ntlm_av_pairs.h b/winpr/sspi/NTLM/ntlm_av_pairs.h
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_av_pairs.h
rename to winpr/sspi/NTLM/ntlm_av_pairs.h

diff --git a/libwinpr-sspi/NTLM/ntlm_compute.c b/winpr/sspi/NTLM/ntlm_compute.c
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_compute.c
rename to winpr/sspi/NTLM/ntlm_compute.c

diff --git a/libwinpr-sspi/NTLM/ntlm_compute.h b/winpr/sspi/NTLM/ntlm_compute.h
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_compute.h
rename to winpr/sspi/NTLM/ntlm_compute.h

diff --git a/libwinpr-sspi/NTLM/ntlm_message.c b/winpr/sspi/NTLM/ntlm_message.c
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_message.c
rename to winpr/sspi/NTLM/ntlm_message.c

diff --git a/libwinpr-sspi/NTLM/ntlm_message.h b/winpr/sspi/NTLM/ntlm_message.h
similarity index 100%
rename from libwinpr-sspi/NTLM/ntlm_message.h
rename to winpr/sspi/NTLM/ntlm_message.h

diff --git a/libwinpr-sspi/Negotiate/negotiate.c b/winpr/sspi/Negotiate/negotiate.c
similarity index 100%
rename from libwinpr-sspi/Negotiate/negotiate.c
rename to winpr/sspi/Negotiate/negotiate.c

diff --git a/libwinpr-sspi/Negotiate/negotiate.h b/winpr/sspi/Negotiate/negotiate.h
similarity index 100%
rename from libwinpr-sspi/Negotiate/negotiate.h
rename to winpr/sspi/Negotiate/negotiate.h

diff --git a/libwinpr-sspi/credssp.c b/winpr/sspi/credssp.c
similarity index 100%
rename from libwinpr-sspi/credssp.c
rename to winpr/sspi/credssp.c

diff --git a/libwinpr-sspi/sspi.c b/winpr/sspi/sspi.c
similarity index 100%
rename from libwinpr-sspi/sspi.c
rename to winpr/sspi/sspi.c

diff --git a/libwinpr-sspi/sspi.h b/winpr/sspi/sspi.h
similarity index 100%
rename from libwinpr-sspi/sspi.h
rename to winpr/sspi/sspi.h