Add remaining protocols, fix client.h in RDP.
This commit is contained in:
parent
1d3fa12747
commit
e9e2d628b6
28
Makefile.am
28
Makefile.am
@ -37,5 +37,31 @@
|
|||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
# Subprojects
|
# Subprojects
|
||||||
SUBDIRS = src/libguac src/guacd
|
DIST_SUBDIRS = \
|
||||||
|
src/libguac \
|
||||||
|
src/guacd \
|
||||||
|
src/protocols/vnc \
|
||||||
|
src/protocols/rdp \
|
||||||
|
src/protocols/ssh \
|
||||||
|
src/protocols/spice
|
||||||
|
|
||||||
|
SUBDIRS = \
|
||||||
|
src/libguac \
|
||||||
|
src/guacd
|
||||||
|
|
||||||
|
if ENABLE_VNC
|
||||||
|
SUBDIRS += src/protocols/vnc
|
||||||
|
endif
|
||||||
|
|
||||||
|
if ENABLE_RDP
|
||||||
|
SUBDIRS += src/protocols/rdp
|
||||||
|
endif
|
||||||
|
|
||||||
|
if ENABLE_SSH
|
||||||
|
SUBDIRS += src/protocols/ssh
|
||||||
|
endif
|
||||||
|
|
||||||
|
if ENABLE_SPICE
|
||||||
|
SUBDIRS += src/protocols/spice
|
||||||
|
endif
|
||||||
|
|
||||||
|
10
configure.ac
10
configure.ac
@ -142,15 +142,19 @@ echo "
|
|||||||
$PACKAGE_NAME version $PACKAGE_VERSION:
|
$PACKAGE_NAME version $PACKAGE_VERSION:
|
||||||
|
|
||||||
Protocol support:
|
Protocol support:
|
||||||
VNC....... ${have_libvncserver}
|
|
||||||
RDP....... ${have_freerdp}
|
RDP....... ${have_freerdp}
|
||||||
SSH....... ${have_libssh}
|
|
||||||
SPICE..... ${have_spice}
|
SPICE..... ${have_spice}
|
||||||
|
SSH....... ${have_libssh}
|
||||||
|
VNC....... ${have_libvncserver}
|
||||||
|
|
||||||
"
|
"
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile
|
AC_CONFIG_FILES([Makefile
|
||||||
src/libguac/Makefile
|
src/libguac/Makefile
|
||||||
src/guacd/Makefile])
|
src/guacd/Makefile
|
||||||
|
src/protocols/rdp/Makefile
|
||||||
|
src/protocols/spice/Makefile
|
||||||
|
src/protocols/ssh/Makefile
|
||||||
|
src/protocols/vnc/Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ noinst_HEADERS = client.h log.h
|
|||||||
guacd_SOURCES = daemon.c client.c log.c
|
guacd_SOURCES = daemon.c client.c log.c
|
||||||
guacd_LDADD = $(LIBGUAC_LTLIB)
|
guacd_LDADD = $(LIBGUAC_LTLIB)
|
||||||
|
|
||||||
EXTRA_DIST = init.d/guacd.in man/guacd.8 LICENSE
|
EXTRA_DIST = init.d/guacd.in man/guacd.8
|
||||||
CLEANFILES = $(init_SCRIPTS)
|
CLEANFILES = $(init_SCRIPTS)
|
||||||
|
|
||||||
init.d/guacd: init.d/guacd.in
|
init.d/guacd: init.d/guacd.in
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole
|
AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole
|
||||||
|
AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
|
||||||
|
|
||||||
libguacincdir = $(includedir)/guacamole
|
libguacincdir = $(includedir)/guacamole
|
||||||
libguacinc_HEADERS = \
|
libguacinc_HEADERS = \
|
||||||
|
@ -38,58 +38,56 @@ AUTOMAKE_OPTIONS = foreign
|
|||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
AM_CFLAGS = -Werror -Wall -Iinclude $(LIBGUAC_INCLUDE)
|
AM_CFLAGS = -Werror -Wall -Iinclude $(LIBGUAC_INCLUDE)
|
||||||
|
AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libguac-client-rdp.la
|
lib_LTLIBRARIES = libguac-client-rdp.la
|
||||||
freerdp_LTLIBRARIES = guac_rdpsnd.la
|
freerdp_LTLIBRARIES = guac_rdpsnd.la
|
||||||
|
|
||||||
libguac_client_rdp_la_SOURCES = \
|
libguac_client_rdp_la_SOURCES = \
|
||||||
$(OGG_SOURCES) \
|
audio.c \
|
||||||
src/audio.c \
|
client.c \
|
||||||
src/client.c \
|
default_pointer.c \
|
||||||
src/default_pointer.c \
|
guac_handlers.c \
|
||||||
src/guac_handlers.c \
|
rdp_bitmap.c \
|
||||||
src/rdp_bitmap.c \
|
rdp_cliprdr.c \
|
||||||
src/rdp_cliprdr.c \
|
rdp_gdi.c \
|
||||||
src/rdp_gdi.c \
|
rdp_glyph.c \
|
||||||
src/rdp_glyph.c \
|
rdp_keymap_base.c \
|
||||||
src/rdp_keymap_base.c \
|
rdp_keymap.c \
|
||||||
src/rdp_keymap.c \
|
rdp_keymap_de_de.c \
|
||||||
src/rdp_keymap_de_de.c \
|
rdp_keymap_failsafe.c \
|
||||||
src/rdp_keymap_failsafe.c \
|
rdp_keymap_fr_fr.c \
|
||||||
src/rdp_keymap_fr_fr.c \
|
rdp_keymap_en_us.c \
|
||||||
src/rdp_keymap_en_us.c \
|
rdp_pointer.c \
|
||||||
src/rdp_pointer.c \
|
wav_encoder.c
|
||||||
src/wav_encoder.c
|
|
||||||
|
|
||||||
guac_rdpsnd_la_SOURCES = \
|
guac_rdpsnd_la_SOURCES = \
|
||||||
guac_rdpsnd/messages.c \
|
guac_rdpsnd/messages.c \
|
||||||
guac_rdpsnd/service.c \
|
guac_rdpsnd/service.c \
|
||||||
src/audio.c
|
audio.c
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
$(OGG_HEADERS) \
|
|
||||||
guac_rdpsnd/messages.h \
|
guac_rdpsnd/messages.h \
|
||||||
guac_rdpsnd/service.h \
|
guac_rdpsnd/service.h \
|
||||||
include/audio.h \
|
audio.h \
|
||||||
include/client.h \
|
client.h \
|
||||||
include/config.h \
|
config.h \
|
||||||
include/default_pointer.h \
|
default_pointer.h \
|
||||||
include/guac_handlers.h \
|
guac_handlers.h \
|
||||||
include/rdp_bitmap.h \
|
rdp_bitmap.h \
|
||||||
include/rdp_cliprdr.h \
|
rdp_cliprdr.h \
|
||||||
include/rdp_gdi.h \
|
rdp_gdi.h \
|
||||||
include/rdp_glyph.h \
|
rdp_glyph.h \
|
||||||
include/rdp_keymap.h \
|
rdp_keymap.h \
|
||||||
include/rdp_pointer.h \
|
rdp_pointer.h \
|
||||||
include/wav_encoder.h
|
wav_encoder.h
|
||||||
|
|
||||||
# Compile OGG support if available
|
# Compile OGG support if available
|
||||||
if ENABLE_OGG
|
if ENABLE_OGG
|
||||||
libguac_client_rdp_la_SOURCES += src/ogg_encoder.c
|
libguac_client_rdp_la_SOURCES += ogg_encoder.c
|
||||||
noinst_HEADERS += include/ogg_encoder.h
|
noinst_HEADERS += ogg_encoder.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0
|
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0
|
||||||
guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared
|
guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared
|
||||||
|
|
||||||
@ -98,5 +96,3 @@ guac_rdpsnd_la_LIBADD = $(LIBGUAC_LTLIB)
|
|||||||
|
|
||||||
freerdpdir = ${libdir}/freerdp/
|
freerdpdir = ${libdir}/freerdp/
|
||||||
|
|
||||||
EXTRA_DIST = LICENSE
|
|
||||||
|
|
||||||
|
@ -38,6 +38,8 @@
|
|||||||
#ifndef _GUAC_RDP_CLIENT_H
|
#ifndef _GUAC_RDP_CLIENT_H
|
||||||
#define _GUAC_RDP_CLIENT_H
|
#define _GUAC_RDP_CLIENT_H
|
||||||
|
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
#include <cairo/cairo.h>
|
#include <cairo/cairo.h>
|
||||||
|
|
||||||
#include <freerdp/freerdp.h>
|
#include <freerdp/freerdp.h>
|
||||||
|
@ -37,20 +37,19 @@
|
|||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
AM_LDFLAGS = $(SPICE_LIBS) $(PTHREAD_LIBS)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libguac-client-spice.la
|
lib_LTLIBRARIES = libguac-client-spice.la
|
||||||
|
|
||||||
libguac_client_spice_la_SOURCES = \
|
libguac_client_spice_la_SOURCES = \
|
||||||
src/client.c \
|
client.c \
|
||||||
src/guac_handlers.c
|
guac_handlers.c
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
include/client.h \
|
client.h \
|
||||||
include/guac_handlers.h
|
guac_handlers.h
|
||||||
|
|
||||||
libguac_client_spice_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @SPICE_CLIENT_GLIB_CFLAGS@ @GLIB_CFLAGS@ $(LIBGUAC_INCLUDE)
|
libguac_client_spice_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @SPICE_CLIENT_GLIB_CFLAGS@ @GLIB_CFLAGS@ $(LIBGUAC_INCLUDE)
|
||||||
libguac_client_spice_la_LIBADD = @SPICE_CLIENT_GLIB_LIBS@ @GLIB_LIBS@ $(LIBGUAC_LTLIB)
|
libguac_client_spice_la_LIBADD = @SPICE_CLIENT_GLIB_LIBS@ @GLIB_LIBS@ $(LIBGUAC_LTLIB)
|
||||||
libguac_client_spice_la_LDFLAGS = -version-info 0:0:0
|
libguac_client_spice_la_LDFLAGS = -version-info 0:0:0
|
||||||
|
|
||||||
EXTRA_DIST = LICENSE
|
|
||||||
|
|
||||||
|
@ -37,42 +37,41 @@
|
|||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
AM_LDFLAGS = $(SSH_LIBS) $(PTHREAD_LIBS)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libguac-client-ssh.la
|
lib_LTLIBRARIES = libguac-client-ssh.la
|
||||||
|
|
||||||
libguac_client_ssh_la_SOURCES = \
|
libguac_client_ssh_la_SOURCES = \
|
||||||
src/blank.c \
|
blank.c \
|
||||||
src/buffer.c \
|
buffer.c \
|
||||||
src/char_mappings.c \
|
char_mappings.c \
|
||||||
src/client.c \
|
client.c \
|
||||||
src/common.c \
|
common.c \
|
||||||
src/cursor.c \
|
cursor.c \
|
||||||
src/display.c \
|
display.c \
|
||||||
src/guac_handlers.c \
|
guac_handlers.c \
|
||||||
src/ibar.c \
|
ibar.c \
|
||||||
src/ssh_client.c \
|
ssh_client.c \
|
||||||
src/terminal.c \
|
terminal.c \
|
||||||
src/terminal_handlers.c
|
terminal_handlers.c
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
include/blank.h \
|
blank.h \
|
||||||
include/buffer.h \
|
buffer.h \
|
||||||
include/char_mappings.h \
|
char_mappings.h \
|
||||||
include/client.h \
|
client.h \
|
||||||
include/common.h \
|
common.h \
|
||||||
include/cursor.h \
|
cursor.h \
|
||||||
include/display.h \
|
display.h \
|
||||||
include/guac_handlers.h \
|
guac_handlers.h \
|
||||||
include/ibar.h \
|
ibar.h \
|
||||||
include/libssh_compat.h \
|
libssh_compat.h \
|
||||||
include/ssh_client.h \
|
ssh_client.h \
|
||||||
include/terminal.h \
|
terminal.h \
|
||||||
include/terminal_handlers.h \
|
terminal_handlers.h \
|
||||||
include/types.h
|
types.h
|
||||||
|
|
||||||
libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ $(LIBGUAC_INCLUDE)
|
libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ $(LIBGUAC_INCLUDE)
|
||||||
libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ $(LIBGUAC_LTLIB)
|
libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ $(LIBGUAC_LTLIB)
|
||||||
libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0
|
libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0
|
||||||
|
|
||||||
EXTRA_DIST = LICENSE
|
|
||||||
|
|
||||||
|
@ -38,14 +38,13 @@ AUTOMAKE_OPTIONS = foreign
|
|||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE)
|
AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE)
|
||||||
|
AM_LDFLAGS = $(VNC_LIBS)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libguac-client-vnc.la
|
lib_LTLIBRARIES = libguac-client-vnc.la
|
||||||
|
|
||||||
libguac_client_vnc_la_SOURCES = src/client.c src/vnc_handlers.c src/guac_handlers.c src/convert.c
|
libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c
|
||||||
noinst_HEADERS = include/client.h include/vnc_handlers.h include/guac_handlers.h include/convert.h
|
noinst_HEADERS = client.h vnc_handlers.h guac_handlers.h convert.h
|
||||||
|
|
||||||
libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0
|
libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0
|
||||||
libguac_client_vnc_la_LIBADD = $(LIBGUAC_LTLIB)
|
libguac_client_vnc_la_LIBADD = $(LIBGUAC_LTLIB)
|
||||||
|
|
||||||
EXTRA_DIST = LICENSE
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user