GUACAMOLE-169: Move common-ssh headers to namespaced directory.

This commit is contained in:
Michael Jumper 2017-02-27 14:28:23 -08:00
parent a808a6b177
commit d371f2d9ee
23 changed files with 49 additions and 49 deletions

View File

@ -23,18 +23,18 @@ ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libguac_common_ssh.la noinst_LTLIBRARIES = libguac_common_ssh.la
libguac_common_ssh_la_SOURCES = \ libguac_common_ssh_la_SOURCES = \
guac_sftp.c \ buffer.c \
guac_ssh.c \ sftp.c \
guac_ssh_buffer.c \ ssh.c \
guac_ssh_key.c \ key.c \
guac_ssh_user.c user.c
noinst_HEADERS = \ noinst_HEADERS = \
guac_sftp.h \ common-ssh/buffer.h \
guac_ssh.h \ common-ssh/key.h \
guac_ssh_buffer.h \ common-ssh/sftp.h \
guac_ssh_key.h \ common-ssh/ssh.h \
guac_ssh_user.h common-ssh/user.h
libguac_common_ssh_la_CFLAGS = \ libguac_common_ssh_la_CFLAGS = \
-Werror -Wall -pedantic \ -Werror -Wall -pedantic \

View File

@ -21,7 +21,7 @@
#define GUAC_COMMON_SSH_SFTP_H #define GUAC_COMMON_SSH_SFTP_H
#include "common/json.h" #include "common/json.h"
#include "guac_ssh.h" #include "ssh.h"
#include <guacamole/object.h> #include <guacamole/object.h>
#include <guacamole/user.h> #include <guacamole/user.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_COMMON_SSH_H #ifndef GUAC_COMMON_SSH_H
#define GUAC_COMMON_SSH_H #define GUAC_COMMON_SSH_H
#include "guac_ssh_user.h" #include "user.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <libssh2.h> #include <libssh2.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_COMMON_SSH_USER_H #ifndef GUAC_COMMON_SSH_USER_H
#define GUAC_COMMON_SSH_USER_H #define GUAC_COMMON_SSH_USER_H
#include "guac_ssh_key.h" #include "key.h"
/** /**
* Data describing an SSH user, including their credentials. * Data describing an SSH user, including their credentials.

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "guac_ssh_buffer.h" #include "common-ssh/buffer.h"
#include "guac_ssh_key.h" #include "common-ssh/key.h"
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/bn.h> #include <openssl/bn.h>

View File

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/object.h> #include <guacamole/object.h>

View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
#include "guac_ssh.h" #include "common-ssh/key.h"
#include "guac_ssh_key.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <libssh2.h> #include <libssh2.h>

View File

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
#include "guac_ssh_key.h" #include "common-ssh/key.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -27,9 +27,9 @@
#include "user.h" #include "user.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include <guac_sftp.h> #include "common-ssh/sftp.h"
#include <guac_ssh.h> #include "common-ssh/ssh.h"
#include <guac_ssh_user.h> #include "common-ssh/user.h"
#endif #endif
#include <freerdp/cache/cache.h> #include <freerdp/cache/cache.h>

View File

@ -40,9 +40,9 @@
#include "rdp_svc.h" #include "rdp_svc.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include <guac_sftp.h> #include "common-ssh/sftp.h"
#include <guac_ssh.h> #include "common-ssh/ssh.h"
#include <guac_ssh_user.h> #include "common-ssh/user.h"
#endif #endif
#include <freerdp/cache/bitmap.h> #include <freerdp/cache/bitmap.h>

View File

@ -39,9 +39,9 @@
#include <guacamole/client.h> #include <guacamole/client.h>
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#endif #endif
#include <pthread.h> #include <pthread.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "rdp.h" #include "rdp.h"
#include "sftp.h" #include "sftp.h"

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal.h"
#include "user.h" #include "user.h"

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "sftp.h" #include "sftp.h"
#include "ssh.h" #include "ssh.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "common/recording.h" #include "common/recording.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "settings.h" #include "settings.h"
#include "sftp.h" #include "sftp.h"
#include "ssh.h" #include "ssh.h"

View File

@ -22,9 +22,9 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include "settings.h" #include "settings.h"
#include "terminal.h" #include "terminal.h"

View File

@ -24,9 +24,9 @@
#include "vnc.h" #include "vnc.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "sftp.h" #include "common-ssh/user.h"
#endif #endif
#ifdef ENABLE_PULSE #ifdef ENABLE_PULSE

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "sftp.h" #include "sftp.h"
#include "vnc.h" #include "vnc.h"

View File

@ -37,8 +37,8 @@
#endif #endif
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "sftp.h" #include "sftp.h"
#endif #endif

View File

@ -37,9 +37,9 @@
#endif #endif
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#endif #endif
#include <pthread.h> #include <pthread.h>