From c21604e2cd2924778f53838376eae69761fe67ac Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 22 Jul 2012 15:34:36 -0700 Subject: [PATCH] Cleaned up Makefile.am's --- libguac/Makefile.am | 1 - libguac/src/Makefile.am | 25 +++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/libguac/Makefile.am b/libguac/Makefile.am index 2f9546f1..18c97410 100644 --- a/libguac/Makefile.am +++ b/libguac/Makefile.am @@ -35,7 +35,6 @@ # ***** END LICENSE BLOCK ***** AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src diff --git a/libguac/src/Makefile.am b/libguac/src/Makefile.am index bafff8b9..ecd7c7f5 100644 --- a/libguac/src/Makefile.am +++ b/libguac/src/Makefile.am @@ -39,13 +39,26 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -pedantic -I../include libguacincdir = $(includedir)/guacamole -libguacinc_HEADERS = ../include/client.h ../include/socket.h ../include/protocol.h ../include/error.h +libguacinc_HEADERS = \ + ../include/client.h \ + ../include/socket.h \ + ../include/protocol.h \ + ../include/error.h + +noinst_HEADERS = \ + ../include/palette.h \ + ../include/client-handlers.h \ + ../include/unicode.h + +libguac_la_SOURCES = \ + client.c \ + socket.c \ + protocol.c \ + client-handlers.c \ + error.c \ + palette.c \ + unicode.c lib_LTLIBRARIES = libguac.la - -libguac_la_SOURCES = client.c socket.c protocol.c client-handlers.c error.c palette.c unicode.c - libguac_la_LDFLAGS = -version-info 3:1:0 -noinst_HEADERS = ../include/palette.h ../include/client-handlers.h ../include/unicode.h -