From e9e2d628b6f53a56e7daac3ba2ee666b5853dd1f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 5 Jun 2013 12:05:39 -0700 Subject: [PATCH] Add remaining protocols, fix client.h in RDP. --- Makefile.am | 28 +++++++++++++- configure.ac | 10 +++-- src/guacd/Makefile.am | 2 +- src/libguac/Makefile.am | 1 + src/protocols/rdp/Makefile.am | 68 ++++++++++++++++----------------- src/protocols/rdp/client.h | 2 + src/protocols/spice/Makefile.am | 11 +++--- src/protocols/ssh/Makefile.am | 55 +++++++++++++------------- src/protocols/vnc/Makefile.am | 7 ++-- 9 files changed, 105 insertions(+), 79 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2f7482c0..6de5b97a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,5 +37,31 @@ ACLOCAL_AMFLAGS = -I m4 # 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 diff --git a/configure.ac b/configure.ac index 79903cea..6e546898 100644 --- a/configure.ac +++ b/configure.ac @@ -142,15 +142,19 @@ echo " $PACKAGE_NAME version $PACKAGE_VERSION: Protocol support: - VNC....... ${have_libvncserver} RDP....... ${have_freerdp} - SSH....... ${have_libssh} SPICE..... ${have_spice} + SSH....... ${have_libssh} + VNC....... ${have_libvncserver} " AC_CONFIG_FILES([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 diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am index c5e4cc10..30dabedc 100644 --- a/src/guacd/Makefile.am +++ b/src/guacd/Makefile.am @@ -47,7 +47,7 @@ noinst_HEADERS = client.h log.h guacd_SOURCES = daemon.c client.c log.c 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) init.d/guacd: init.d/guacd.in diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index 1126f6a8..fc97f376 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -37,6 +37,7 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole +AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS) libguacincdir = $(includedir)/guacamole libguacinc_HEADERS = \ diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index a4864469..148beae5 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -38,58 +38,56 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -Iinclude $(LIBGUAC_INCLUDE) +AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS) lib_LTLIBRARIES = libguac-client-rdp.la freerdp_LTLIBRARIES = guac_rdpsnd.la libguac_client_rdp_la_SOURCES = \ - $(OGG_SOURCES) \ - src/audio.c \ - src/client.c \ - src/default_pointer.c \ - src/guac_handlers.c \ - src/rdp_bitmap.c \ - src/rdp_cliprdr.c \ - src/rdp_gdi.c \ - src/rdp_glyph.c \ - src/rdp_keymap_base.c \ - src/rdp_keymap.c \ - src/rdp_keymap_de_de.c \ - src/rdp_keymap_failsafe.c \ - src/rdp_keymap_fr_fr.c \ - src/rdp_keymap_en_us.c \ - src/rdp_pointer.c \ - src/wav_encoder.c + audio.c \ + client.c \ + default_pointer.c \ + guac_handlers.c \ + rdp_bitmap.c \ + rdp_cliprdr.c \ + rdp_gdi.c \ + rdp_glyph.c \ + rdp_keymap_base.c \ + rdp_keymap.c \ + rdp_keymap_de_de.c \ + rdp_keymap_failsafe.c \ + rdp_keymap_fr_fr.c \ + rdp_keymap_en_us.c \ + rdp_pointer.c \ + wav_encoder.c guac_rdpsnd_la_SOURCES = \ guac_rdpsnd/messages.c \ guac_rdpsnd/service.c \ - src/audio.c + audio.c noinst_HEADERS = \ - $(OGG_HEADERS) \ guac_rdpsnd/messages.h \ guac_rdpsnd/service.h \ - include/audio.h \ - include/client.h \ - include/config.h \ - include/default_pointer.h \ - include/guac_handlers.h \ - include/rdp_bitmap.h \ - include/rdp_cliprdr.h \ - include/rdp_gdi.h \ - include/rdp_glyph.h \ - include/rdp_keymap.h \ - include/rdp_pointer.h \ - include/wav_encoder.h + audio.h \ + client.h \ + config.h \ + default_pointer.h \ + guac_handlers.h \ + rdp_bitmap.h \ + rdp_cliprdr.h \ + rdp_gdi.h \ + rdp_glyph.h \ + rdp_keymap.h \ + rdp_pointer.h \ + wav_encoder.h # Compile OGG support if available if ENABLE_OGG - libguac_client_rdp_la_SOURCES += src/ogg_encoder.c - noinst_HEADERS += include/ogg_encoder.h + libguac_client_rdp_la_SOURCES += ogg_encoder.c + noinst_HEADERS += ogg_encoder.h endif - libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared @@ -98,5 +96,3 @@ guac_rdpsnd_la_LIBADD = $(LIBGUAC_LTLIB) freerdpdir = ${libdir}/freerdp/ -EXTRA_DIST = LICENSE - diff --git a/src/protocols/rdp/client.h b/src/protocols/rdp/client.h index 78bbe2ad..1bb8ca73 100644 --- a/src/protocols/rdp/client.h +++ b/src/protocols/rdp/client.h @@ -38,6 +38,8 @@ #ifndef _GUAC_RDP_CLIENT_H #define _GUAC_RDP_CLIENT_H +#include + #include #include diff --git a/src/protocols/spice/Makefile.am b/src/protocols/spice/Makefile.am index b897f4d4..447bc255 100644 --- a/src/protocols/spice/Makefile.am +++ b/src/protocols/spice/Makefile.am @@ -37,20 +37,19 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 +AM_LDFLAGS = $(SPICE_LIBS) $(PTHREAD_LIBS) lib_LTLIBRARIES = libguac-client-spice.la libguac_client_spice_la_SOURCES = \ - src/client.c \ - src/guac_handlers.c + client.c \ + guac_handlers.c noinst_HEADERS = \ - include/client.h \ - include/guac_handlers.h + client.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_LIBADD = @SPICE_CLIENT_GLIB_LIBS@ @GLIB_LIBS@ $(LIBGUAC_LTLIB) libguac_client_spice_la_LDFLAGS = -version-info 0:0:0 -EXTRA_DIST = LICENSE - diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am index 3c7f4b2e..beb77efe 100644 --- a/src/protocols/ssh/Makefile.am +++ b/src/protocols/ssh/Makefile.am @@ -37,42 +37,41 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 +AM_LDFLAGS = $(SSH_LIBS) $(PTHREAD_LIBS) lib_LTLIBRARIES = libguac-client-ssh.la libguac_client_ssh_la_SOURCES = \ - src/blank.c \ - src/buffer.c \ - src/char_mappings.c \ - src/client.c \ - src/common.c \ - src/cursor.c \ - src/display.c \ - src/guac_handlers.c \ - src/ibar.c \ - src/ssh_client.c \ - src/terminal.c \ - src/terminal_handlers.c + blank.c \ + buffer.c \ + char_mappings.c \ + client.c \ + common.c \ + cursor.c \ + display.c \ + guac_handlers.c \ + ibar.c \ + ssh_client.c \ + terminal.c \ + terminal_handlers.c noinst_HEADERS = \ - include/blank.h \ - include/buffer.h \ - include/char_mappings.h \ - include/client.h \ - include/common.h \ - include/cursor.h \ - include/display.h \ - include/guac_handlers.h \ - include/ibar.h \ - include/libssh_compat.h \ - include/ssh_client.h \ - include/terminal.h \ - include/terminal_handlers.h \ - include/types.h + blank.h \ + buffer.h \ + char_mappings.h \ + client.h \ + common.h \ + cursor.h \ + display.h \ + guac_handlers.h \ + ibar.h \ + libssh_compat.h \ + ssh_client.h \ + terminal.h \ + terminal_handlers.h \ + types.h 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_LDFLAGS = -version-info 0:0:0 -EXTRA_DIST = LICENSE - diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am index e71b89bf..acf4f93f 100644 --- a/src/protocols/vnc/Makefile.am +++ b/src/protocols/vnc/Makefile.am @@ -38,14 +38,13 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE) +AM_LDFLAGS = $(VNC_LIBS) 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 -noinst_HEADERS = include/client.h include/vnc_handlers.h include/guac_handlers.h include/convert.h +libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c +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_LIBADD = $(LIBGUAC_LTLIB) -EXTRA_DIST = LICENSE -