From c199cfc8d7a2ac156afc0a5e4cc9544c3cead315 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 8 Jul 2015 15:16:40 -0700 Subject: [PATCH] GUAC-1171: Adopt cleaner style for Makefile.am. --- Makefile.am | 5 +- src/common-ssh/Makefile.am | 15 +- src/common/Makefile.am | 8 +- src/guacd/Makefile.am | 40 +++-- src/libguac/Makefile.am | 22 ++- src/protocols/rdp/Makefile.am | 254 ++++++++++++++++++++----------- src/protocols/ssh/Makefile.am | 23 ++- src/protocols/telnet/Makefile.am | 20 ++- src/protocols/vnc/Makefile.am | 24 +-- src/terminal/Makefile.am | 21 ++- tests/Makefile.am | 51 ++++--- 11 files changed, 324 insertions(+), 159 deletions(-) diff --git a/Makefile.am b/Makefile.am index 234ad840..9100f8f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,5 +65,8 @@ if ENABLE_VNC SUBDIRS += src/protocols/vnc endif -EXTRA_DIST = LICENSE doc/Doxyfile bin/guacctl +EXTRA_DIST = \ + LICENSE \ + bin/guacctl \ + doc/Doxyfile diff --git a/src/common-ssh/Makefile.am b/src/common-ssh/Makefile.am index 2720ed50..33a808c4 100644 --- a/src/common-ssh/Makefile.am +++ b/src/common-ssh/Makefile.am @@ -22,7 +22,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@ noinst_LTLIBRARIES = libguac_common_ssh.la @@ -32,6 +31,16 @@ libguac_common_ssh_la_SOURCES = \ noinst_HEADERS = \ guac_ssh_config.h -libguac_common_ssh_la_LIBADD = @LIBGUAC_LTLIB@ -libguac_common_ssh_la_LDFLAGS = @SSH_LIBS@ @SSL_LIBS@ @PTHREAD_LIBS@ +libguac_common_ssh_la_CFLAGS = \ + -Werror -Wall -pedantic \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +libguac_common_ssh_la_LIBADD = \ + @LIBGUAC_LTLIB@ + +libguac_common_ssh_la_LDFLAGS = \ + @PTHREAD_LIBS@ \ + @SSH_LIBS@ \ + @SSL_LIBS@ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 785d0f22..4f4b02c8 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -22,7 +22,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ noinst_LTLIBRARIES = libguac_common.la @@ -50,5 +49,10 @@ libguac_common_la_SOURCES = \ guac_string.c \ guac_surface.c -libguac_common_la_LIBADD = @LIBGUAC_LTLIB@ +libguac_common_la_CFLAGS = \ + -Werror -Wall -pedantic \ + @LIBGUAC_INCLUDE@ + +libguac_common_la_LIBADD = \ + @LIBGUAC_LTLIB@ diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am index 230ef47a..b68e4956 100644 --- a/src/guacd/Makefile.am +++ b/src/guacd/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,8 +22,6 @@ AUTOMAKE_OPTIONS = foreign -AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@ - sbin_PROGRAMS = guacd man_MANS = \ @@ -40,17 +38,31 @@ noinst_HEADERS = \ guacd_SOURCES = \ daemon.c \ - client.c \ - client-map.c \ - conf-args.c \ - conf-file.c \ - conf-parse.c \ - log.c + client.c \ + client-map.c \ + conf-args.c \ + conf-file.c \ + conf-parse.c \ + log.c -guacd_LDADD = @LIBGUAC_LTLIB@ @COMMON_LTLIB@ -guacd_LDFLAGS = @PTHREAD_LIBS@ @SSL_LIBS@ +guacd_CFLAGS = \ + -Werror -Wall -pedantic \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +guacd_LDADD = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ + +guacd_LDFLAGS = \ + @PTHREAD_LIBS@ \ + @SSL_LIBS@ + +EXTRA_DIST = \ + init.d/guacd.in \ + man/guacd.8 \ + man/guacd.conf.5 -EXTRA_DIST = init.d/guacd.in man/guacd.8 man/guacd.conf.5 CLEANFILES = $(init_SCRIPTS) # SSL support @@ -65,7 +77,7 @@ initdir = @init_dir@ init_SCRIPTS = init.d/guacd init.d/guacd: init.d/guacd.in - sed -e 's,[@]sbindir[@],$(sbindir),g' < init.d/guacd.in > init.d/guacd - chmod +x init.d/guacd + sed -e 's,[@]sbindir[@],$(sbindir),g' < init.d/guacd.in > init.d/guacd + chmod +x init.d/guacd endif diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index f6298a33..bdef017c 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,11 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole + +lib_LTLIBRARIES = libguac.la libguacincdir = $(includedir)/guacamole + libguacinc_HEADERS = \ guacamole/audio.h \ guacamole/audio-fntypes.h \ @@ -89,7 +91,17 @@ libguac_la_SOURCES += ogg_encoder.c noinst_HEADERS += ogg_encoder.h endif -lib_LTLIBRARIES = libguac.la -libguac_la_LDFLAGS = -version-info 9:0:0 @PTHREAD_LIBS@ @CAIRO_LIBS@ @PNG_LIBS@ @VORBIS_LIBS@ @UUID_LIBS@ -libguac_la_LIBADD = @LIBADD_DLOPEN@ +libguac_la_CFLAGS = \ + -Werror -Wall -pedantic -Iguacamole + +libguac_la_LDFLAGS = \ + -version-info 9:0:0 \ + @CAIRO_LIBS@ \ + @PNG_LIBS@ \ + @PTHREAD_LIBS@ \ + @UUID_LIBS@ \ + @VORBIS_LIBS@ + +libguac_la_LIBADD = \ + @LIBADD_DLOPEN@ diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 95ac7426..d67c9976 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,83 +21,81 @@ # AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@ lib_LTLIBRARIES = libguac-client-rdp.la libguac_client_rdp_la_SOURCES = \ - _generated_keymaps.c \ - client.c \ - guac_handlers.c \ - rdp_bitmap.c \ - rdp_cliprdr.c \ - rdp_color.c \ - rdp_fs.c \ - rdp_gdi.c \ - rdp_glyph.c \ - rdp_keymap.c \ - rdp_pointer.c \ - rdp_rail.c \ - rdp_settings.c \ - rdp_stream.c \ - rdp_svc.c \ - resolution.c \ - unicode.c + _generated_keymaps.c \ + client.c \ + guac_handlers.c \ + rdp_bitmap.c \ + rdp_cliprdr.c \ + rdp_color.c \ + rdp_fs.c \ + rdp_gdi.c \ + rdp_glyph.c \ + rdp_keymap.c \ + rdp_pointer.c \ + rdp_rail.c \ + rdp_settings.c \ + rdp_stream.c \ + rdp_svc.c \ + resolution.c \ + unicode.c guacsvc_sources = \ - guac_svc/svc_service.c \ - rdp_svc.c + guac_svc/svc_service.c \ + rdp_svc.c guacsnd_sources = \ - guac_rdpsnd/rdpsnd_messages.c \ - guac_rdpsnd/rdpsnd_service.c + guac_rdpsnd/rdpsnd_messages.c \ + guac_rdpsnd/rdpsnd_service.c guacdr_sources = \ - guac_rdpdr/rdpdr_fs_messages.c \ - guac_rdpdr/rdpdr_fs_messages_dir_info.c \ - guac_rdpdr/rdpdr_fs_messages_file_info.c \ - guac_rdpdr/rdpdr_fs_messages_vol_info.c \ - guac_rdpdr/rdpdr_fs_service.c \ - guac_rdpdr/rdpdr_messages.c \ - guac_rdpdr/rdpdr_printer.c \ - guac_rdpdr/rdpdr_service.c \ - rdp_fs.c \ - rdp_stream.c \ - unicode.c + guac_rdpdr/rdpdr_fs_messages.c \ + guac_rdpdr/rdpdr_fs_messages_dir_info.c \ + guac_rdpdr/rdpdr_fs_messages_file_info.c \ + guac_rdpdr/rdpdr_fs_messages_vol_info.c \ + guac_rdpdr/rdpdr_fs_service.c \ + guac_rdpdr/rdpdr_messages.c \ + guac_rdpdr/rdpdr_printer.c \ + guac_rdpdr/rdpdr_service.c \ + rdp_fs.c \ + rdp_stream.c \ + unicode.c noinst_HEADERS = \ - compat/client-cliprdr.h \ - compat/rail.h \ - guac_rdpdr/rdpdr_fs_messages.h \ - guac_rdpdr/rdpdr_fs_messages_dir_info.h \ - guac_rdpdr/rdpdr_fs_messages_file_info.h \ - guac_rdpdr/rdpdr_fs_messages_vol_info.h \ - guac_rdpdr/rdpdr_fs_service.h \ - guac_rdpdr/rdpdr_messages.h \ - guac_rdpdr/rdpdr_printer.h \ - guac_rdpdr/rdpdr_service.h \ - guac_rdpsnd/rdpsnd_messages.h \ - guac_rdpsnd/rdpsnd_service.h \ - guac_svc/svc_service.h \ - client.h \ - guac_handlers.h \ - rdp_bitmap.h \ - rdp_cliprdr.h \ - rdp_color.h \ - rdp_fs.h \ - rdp_gdi.h \ - rdp_glyph.h \ - rdp_keymap.h \ - rdp_pointer.h \ - rdp_rail.h \ - rdp_settings.h \ - rdp_status.h \ - rdp_stream.h \ - rdp_svc.h \ - resolution.h \ - unicode.h + compat/client-cliprdr.h \ + compat/rail.h \ + guac_rdpdr/rdpdr_fs_messages.h \ + guac_rdpdr/rdpdr_fs_messages_dir_info.h \ + guac_rdpdr/rdpdr_fs_messages_file_info.h \ + guac_rdpdr/rdpdr_fs_messages_vol_info.h \ + guac_rdpdr/rdpdr_fs_service.h \ + guac_rdpdr/rdpdr_messages.h \ + guac_rdpdr/rdpdr_printer.h \ + guac_rdpdr/rdpdr_service.h \ + guac_rdpsnd/rdpsnd_messages.h \ + guac_rdpsnd/rdpsnd_service.h \ + guac_svc/svc_service.h \ + client.h \ + guac_handlers.h \ + rdp_bitmap.h \ + rdp_cliprdr.h \ + rdp_color.h \ + rdp_fs.h \ + rdp_gdi.h \ + rdp_glyph.h \ + rdp_keymap.h \ + rdp_pointer.h \ + rdp_rail.h \ + rdp_settings.h \ + rdp_status.h \ + rdp_stream.h \ + rdp_svc.h \ + resolution.h \ + unicode.h # Add compatibility layer for WinPR if not available if ! ENABLE_WINPR @@ -114,17 +112,83 @@ noinst_HEADERS += rdp_disp.h libguac_client_rdp_la_SOURCES += rdp_disp.c endif -libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 @RDP_LIBS@ @PTHREAD_LIBS@ @CAIRO_LIBS@ -guacsvc_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@ -guacsnd_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@ -guacdr_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@ +# +# Main RDP client library +# -libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@ @COMMON_LTLIB@ -guacsvc_libadd = @LIBGUAC_LTLIB@ @COMMON_LTLIB@ -guacsnd_libadd = @LIBGUAC_LTLIB@ -guacdr_libadd = @LIBGUAC_LTLIB@ +libguac_client_rdp_la_CFLAGS = \ + -Werror -Wall -Iinclude \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ +libguac_client_rdp_la_LDFLAGS = \ + -version-info 0:0:0 \ + @CAIRO_LIBS@ \ + @PTHREAD_LIBS@ \ + @RDP_LIBS@ + +libguac_client_rdp_la_LIBADD = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ + +# +# RDPDR +# + +guacdr_cflags = \ + -Werror -Wall -Iinclude \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +guacdr_ldflags = \ + -module -avoid-version -shared \ + @PTHREAD_LIBS@ \ + @RDP_LIBS@ + +guacdr_libadd = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ + +# +# RDPSND +# + +guacsnd_cflags = \ + -Werror -Wall -Iinclude \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +guacsnd_ldflags = \ + -module -avoid-version -shared \ + @PTHREAD_LIBS@ \ + @RDP_LIBS@ + +guacsnd_libadd = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ + +# +# Static Virtual Channels +# + +guacsvc_cflags = \ + -Werror -Wall -Iinclude \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +guacsvc_ldflags = \ + -module -avoid-version -shared \ + @PTHREAD_LIBS@ \ + @RDP_LIBS@ + +guacsvc_libadd = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ + +# # Autogenerate keymaps +# + CLEANFILES = _generated_keymaps.c BUILT_SOURCES = _generated_keymaps.c @@ -140,41 +204,55 @@ rdp_keymaps = \ _generated_keymaps.c: $(rdp_keymaps) keymaps/generate.pl $(rdp_keymaps) -EXTRA_DIST = $(rdp_keymaps) keymaps/generate.pl +EXTRA_DIST = \ + $(rdp_keymaps) \ + keymaps/generate.pl if LEGACY_FREERDP_EXTENSIONS # FreeRDP 1.0-style extensions -freerdp_LTLIBRARIES = guacsvc.la guacsnd.la guacdr.la +freerdp_LTLIBRARIES = \ + guacdr.la \ + guacsnd.la \ + guacsvc.la -guacsvc_la_SOURCES = ${guacsvc_sources} -guacsvc_la_LDFLAGS = ${guacsvc_ldflags} -guacsvc_la_LIBADD = ${guacsvc_libadd} +guacdr_la_SOURCES = ${guacdr_sources} +guacdr_la_CFLAGS = ${guacdr_cflags} +guacdr_la_LDFLAGS = ${guacdr_ldflags} +guacdr_la_LIBADD = ${guacdr_libadd} guacsnd_la_SOURCES = ${guacsnd_sources} +guacsnd_la_CFLAGS = ${guacsnd_cflags} guacsnd_la_LDFLAGS = ${guacsnd_ldflags} guacsnd_la_LIBADD = ${guacsnd_libadd} -guacdr_la_SOURCES = ${guacdr_sources} -guacdr_la_LDFLAGS = ${guacdr_ldflags} -guacdr_la_LIBADD = ${guacdr_libadd} +guacsvc_la_SOURCES = ${guacsvc_sources} +guacsvc_la_CFLAGS = ${guacsvc_cflags} +guacsvc_la_LDFLAGS = ${guacsvc_ldflags} +guacsvc_la_LIBADD = ${guacsvc_libadd} else # FreeRDP 1.1 (and hopefully onward) extensions -freerdp_LTLIBRARIES = guacsvc-client.la guacsnd-client.la guacdr-client.la +freerdp_LTLIBRARIES = \ + guacdr-client.la \ + guacsnd-client.la \ + guacsvc-client.la -guacsvc_client_la_SOURCES = ${guacsvc_sources} -guacsvc_client_la_LDFLAGS = ${guacsvc_ldflags} -guacsvc_client_la_LIBADD = ${guacsvc_libadd} +guacdr_client_la_SOURCES = ${guacdr_sources} +guacdr_client_la_CFLAGS = ${guacdr_cflags} +guacdr_client_la_LDFLAGS = ${guacdr_ldflags} +guacdr_client_la_LIBADD = ${guacdr_libadd} guacsnd_client_la_SOURCES = ${guacsnd_sources} +guacsnd_client_la_CFLAGS = ${guacsnd_cflags} guacsnd_client_la_LDFLAGS = ${guacsnd_ldflags} guacsnd_client_la_LIBADD = ${guacsnd_libadd} -guacdr_client_la_SOURCES = ${guacdr_sources} -guacdr_client_la_LDFLAGS = ${guacdr_ldflags} -guacdr_client_la_LIBADD = ${guacdr_libadd} +guacsvc_client_la_SOURCES = ${guacsvc_sources} +guacsvc_client_la_CFLAGS = ${guacsvc_cflags} +guacsvc_client_la_LDFLAGS = ${guacsvc_ldflags} +guacsvc_client_la_LIBADD = ${guacsvc_libadd} endif diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am index 65a7e538..e13bc253 100644 --- a/src/protocols/ssh/Makefile.am +++ b/src/protocols/ssh/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,6 @@ # AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libguac-client-ssh.la @@ -50,7 +49,21 @@ libguac_client_ssh_la_SOURCES += ssh_agent.c noinst_HEADERS += ssh_agent.h endif -libguac_client_ssh_la_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@ @TERMINAL_INCLUDE@ @COMMON_SSH_INCLUDE@ -libguac_client_ssh_la_LIBADD = @LIBGUAC_LTLIB@ @TERMINAL_LTLIB@ @COMMON_SSH_LTLIB@ -libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 @SSH_LIBS@ @SSL_LIBS@ @PTHREAD_LIBS@ +libguac_client_ssh_la_CFLAGS = \ + -Werror -Wall -Iinclude \ + @COMMON_SSH_INCLUDE@ \ + @LIBGUAC_INCLUDE@ \ + @TERMINAL_INCLUDE@ + +libguac_client_ssh_la_LIBADD = \ + @COMMON_LTLIB@ \ + @COMMON_SSH_LTLIB@ \ + @LIBGUAC_LTLIB@ \ + @TERMINAL_LTLIB@ + +libguac_client_ssh_la_LDFLAGS = \ + -version-info 0:0:0 \ + @PTHREAD_LIBS@ \ + @SSH_LIBS@ \ + @SSL_LIBS@ diff --git a/src/protocols/telnet/Makefile.am b/src/protocols/telnet/Makefile.am index 58323b8e..fdaf00f0 100644 --- a/src/protocols/telnet/Makefile.am +++ b/src/protocols/telnet/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,6 @@ # AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libguac-client-telnet.la @@ -38,7 +37,18 @@ noinst_HEADERS = \ guac_handlers.h \ telnet_client.h -libguac_client_telnet_la_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@ @TERMINAL_INCLUDE@ -libguac_client_telnet_la_LIBADD = @LIBGUAC_LTLIB@ @TERMINAL_LTLIB@ -libguac_client_telnet_la_LDFLAGS = -version-info 0:0:0 @TELNET_LIBS@ @PTHREAD_LIBS@ +libguac_client_telnet_la_CFLAGS = \ + -Werror -Wall -Iinclude \ + @LIBGUAC_INCLUDE@ \ + @TERMINAL_INCLUDE@ + +libguac_client_telnet_la_LIBADD = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ \ + @TERMINAL_LTLIB@ + +libguac_client_telnet_la_LDFLAGS = \ + -version-info 0:0:0 \ + @PTHREAD_LIBS@ \ + @TELNET_LIBS@ diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am index 17222a70..39b38e41 100644 --- a/src/protocols/vnc/Makefile.am +++ b/src/protocols/vnc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,11 +21,7 @@ # AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic -Iinclude \ - @COMMON_INCLUDE@ \ - @LIBGUAC_INCLUDE@ lib_LTLIBRARIES = libguac-client-vnc.la @@ -47,10 +43,18 @@ libguac_client_vnc_la_SOURCES += pulse.c noinst_HEADERS += pulse.h endif -libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0 \ - @CAIRO_LIBS@ \ - @PULSE_LIBS@ \ - @VNC_LIBS@ +libguac_client_vnc_la_CFLAGS = \ + -Werror -Wall -pedantic -Iinclude \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ -libguac_client_vnc_la_LIBADD = @LIBGUAC_LTLIB@ @COMMON_LTLIB@ +libguac_client_vnc_la_LDFLAGS = \ + -version-info 0:0:0 \ + @CAIRO_LIBS@ \ + @PULSE_LIBS@ \ + @VNC_LIBS@ + +libguac_client_vnc_la_LIBADD = \ + @COMMON_LTLIB@ \ + @LIBGUAC_LTLIB@ diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index 1e7ca72d..40aca246 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@ noinst_LTLIBRARIES = libguac_terminal.la @@ -55,6 +54,20 @@ libguac_terminal_la_SOURCES = \ terminal.c \ terminal_handlers.c -libguac_terminal_la_LIBADD = @LIBGUAC_LTLIB@ @COMMON_LTLIB@ -libguac_terminal_la_LDFLAGS = @PTHREAD_LIBS@ @PANGO_LIBS@ @PANGOCAIRO_LIBS@ @CAIRO_LIBS@ @MATH_LIBS@ +libguac_terminal_la_CFLAGS = \ + -Werror -Wall -pedantic \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ \ + @PANGO_CFLAGS@ \ + @PANGOCAIRO_CFLAGS@ + +libguac_terminal_la_LIBADD = \ + @LIBGUAC_LTLIB@ + +libguac_terminal_la_LDFLAGS = \ + @CAIRO_LIBS@ \ + @MATH_LIBS@ \ + @PANGO_LIBS@ \ + @PANGOCAIRO_LIBS@ \ + @PTHREAD_LIBS@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e2de545..0007ef02 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 Glyptodon LLC +# Copyright (C) 2015 Glyptodon LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,34 +22,41 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@ TESTS = test_libguac check_PROGRAMS = test_libguac noinst_HEADERS = \ - client/client_suite.h \ - common/common_suite.h \ - protocol/suite.h \ - util/util_suite.h + client/client_suite.h \ + common/common_suite.h \ + protocol/suite.h \ + util/util_suite.h test_libguac_SOURCES = \ test_libguac.c \ - client/client_suite.c \ - client/buffer_pool.c \ - client/layer_pool.c \ - common/common_suite.c \ - common/guac_iconv.c \ - common/guac_string.c \ - protocol/suite.c \ - protocol/base64_decode.c \ - protocol/instruction_parse.c \ - protocol/instruction_read.c \ - protocol/instruction_write.c \ - protocol/nest_write.c \ - util/util_suite.c \ - util/guac_pool.c \ - util/guac_unicode.c + client/client_suite.c \ + client/buffer_pool.c \ + client/layer_pool.c \ + common/common_suite.c \ + common/guac_iconv.c \ + common/guac_string.c \ + protocol/suite.c \ + protocol/base64_decode.c \ + protocol/instruction_parse.c \ + protocol/instruction_read.c \ + protocol/instruction_write.c \ + protocol/nest_write.c \ + util/util_suite.c \ + util/guac_pool.c \ + util/guac_unicode.c -test_libguac_LDADD = @LIBGUAC_LTLIB@ @CUNIT_LIBS@ @COMMON_LTLIB@ +test_libguac_CFLAGS = \ + -Werror -Wall -pedantic \ + @COMMON_INCLUDE@ \ + @LIBGUAC_INCLUDE@ + +test_libguac_LDADD = \ + @COMMON_LTLIB@ \ + @CUNIT_LIBS@ \ + @LIBGUAC_LTLIB@