GUAC-1171: Adopt cleaner style for Makefile.am.

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
 

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_CFLAGS = \
-libguac_common_ssh_la_LDFLAGS = @SSH_LIBS@ @SSL_LIBS@ @PTHREAD_LIBS@
+    -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@
 

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@
 

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 =           \
@@ -47,10 +45,24 @@ guacd_SOURCES =   \
     conf-parse.c  \
     log.c
 
-guacd_LDADD   = @LIBGUAC_LTLIB@ @COMMON_LTLIB@
+guacd_CFLAGS =              \
-guacd_LDFLAGS = @PTHREAD_LIBS@ @SSL_LIBS@
+    -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

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_CFLAGS = \
-libguac_la_LDFLAGS = -version-info 9:0:0 @PTHREAD_LIBS@ @CAIRO_LIBS@ @PNG_LIBS@ @VORBIS_LIBS@ @UUID_LIBS@
+    -Werror -Wall -pedantic -Iguacamole
-libguac_la_LIBADD = @LIBADD_DLOPEN@ 
+
+libguac_la_LDFLAGS =    \
+    -version-info 9:0:0 \
+    @CAIRO_LIBS@        \
+    @PNG_LIBS@          \
+    @PTHREAD_LIBS@      \
+    @UUID_LIBS@         \
+    @VORBIS_LIBS@
+
+libguac_la_LIBADD = \
+    @LIBADD_DLOPEN@ 
 

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,9 +21,7 @@
 #
 
 AUTOMAKE_OPTIONS = foreign
-
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@
 
 lib_LTLIBRARIES = libguac-client-rdp.la
 
@@ -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@
+# Main RDP client library
-guacsnd_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@
+#
-guacdr_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@
 
-libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@ @COMMON_LTLIB@
+libguac_client_rdp_la_CFLAGS = \
-guacsvc_libadd = @LIBGUAC_LTLIB@ @COMMON_LTLIB@
+    -Werror -Wall -Iinclude    \
-guacsnd_libadd = @LIBGUAC_LTLIB@
+    @COMMON_INCLUDE@           \
-guacdr_libadd = @LIBGUAC_LTLIB@
+    @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}
+guacdr_la_SOURCES = ${guacdr_sources}
-guacsvc_la_LDFLAGS = ${guacsvc_ldflags}
+guacdr_la_CFLAGS  = ${guacdr_cflags}
-guacsvc_la_LIBADD  = ${guacsvc_libadd}
+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}
+guacsvc_la_SOURCES = ${guacsvc_sources}
-guacdr_la_LDFLAGS = ${guacdr_ldflags}
+guacsvc_la_CFLAGS  = ${guacsvc_cflags}
-guacdr_la_LIBADD  = ${guacdr_libadd}
+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}
+guacdr_client_la_SOURCES = ${guacdr_sources}
-guacsvc_client_la_LDFLAGS = ${guacsvc_ldflags}
+guacdr_client_la_CFLAGS  = ${guacdr_cflags}
-guacsvc_client_la_LIBADD  = ${guacsvc_libadd}
+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}
+guacsvc_client_la_SOURCES = ${guacsvc_sources}
-guacdr_client_la_LDFLAGS = ${guacdr_ldflags}
+guacsvc_client_la_CFLAGS  = ${guacsvc_cflags}
-guacdr_client_la_LIBADD  = ${guacdr_libadd}
+guacsvc_client_la_LDFLAGS = ${guacsvc_ldflags}
+guacsvc_client_la_LIBADD  = ${guacsvc_libadd}
 
 endif
 

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_CFLAGS = \
-libguac_client_ssh_la_LIBADD = @LIBGUAC_LTLIB@ @TERMINAL_LTLIB@ @COMMON_SSH_LTLIB@
+    -Werror -Wall -Iinclude    \
-libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 @SSH_LIBS@ @SSL_LIBS@ @PTHREAD_LIBS@
+    @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@
 

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_CFLAGS = \
-libguac_client_telnet_la_LIBADD = @LIBGUAC_LTLIB@ @TERMINAL_LTLIB@
+    -Werror -Wall -Iinclude       \
-libguac_client_telnet_la_LDFLAGS = -version-info 0:0:0 @TELNET_LIBS@ @PTHREAD_LIBS@
+    @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@
 

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 \
+libguac_client_vnc_la_CFLAGS =        \
+    -Werror -Wall -pedantic -Iinclude \
+    @COMMON_INCLUDE@                  \
+    @LIBGUAC_INCLUDE@
+
+libguac_client_vnc_la_LDFLAGS = \
+    -version-info 0:0:0         \
     @CAIRO_LIBS@                \
     @PULSE_LIBS@                \
     @VNC_LIBS@ 
 
-libguac_client_vnc_la_LIBADD  = @LIBGUAC_LTLIB@ @COMMON_LTLIB@
+libguac_client_vnc_la_LIBADD = \
+    @COMMON_LTLIB@             \
+    @LIBGUAC_LTLIB@
 

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_CFLAGS = \
-libguac_terminal_la_LDFLAGS = @PTHREAD_LIBS@ @PANGO_LIBS@ @PANGOCAIRO_LIBS@ @CAIRO_LIBS@ @MATH_LIBS@
+    -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@
 

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,7 +22,6 @@
 
 AUTOMAKE_OPTIONS = foreign 
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@
 
 TESTS = test_libguac
 check_PROGRAMS = test_libguac
@@ -51,5 +50,13 @@ test_libguac_SOURCES =           \
     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@