[gtk-vnc] Change the way header files are handled by automake

[Daniel P. Berrange <dberrange src gnome org>]

commit e468101919b041dad8b309e498f852d72bdeabac
Author: Daniel P. Berrange <berrange redhat com>
Date:   Tue Mar 13 18:46:01 2012 +0000

    Change the way header files are handled by automake
    
    Switch over to using the official _HEADERS target against the
    library, instead of doing it manually. This helps automake
    with VPATH builds

 src/Makefile.am |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 46366a3..7d3e284 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,8 +53,8 @@ libgvnc_1_0_la_LDFLAGS = \
 			$(VERSION_SCRIPT_FLAGS)$(GVNC_VERSION_FILE) \
 			-version-info 0:1:0 $(NO_UNDEFINED_FLAGS)
 
-gvnc_includedir = $(includedir)/gvnc-1.0/
-gvnc_include_HEADERS = \
+libgvnc_1_0_ladir = $(includedir)/gvnc-1.0
+libgvnc_1_0_la_HEADERS = \
 			gvnc.h \
 			vncpixelformat.h \
 			vncaudioformat.h \
@@ -66,8 +66,11 @@ gvnc_include_HEADERS = \
 			vnccursor.h \
 			vnccolormap.h \
 			vncconnection.h \
+			vncutil.h \
+			$(NULL)
+nodist_libgvnc_1_0_la_HEADERS = \
 			vncconnectionenums.h \
-			vncutil.h
+			$(NULL)
 
 libgvnc_1_0_la_SOURCES = \
 			coroutine.h \
@@ -85,9 +88,11 @@ libgvnc_1_0_la_SOURCES = \
 			vnccolormap.h vnccolormap.c \
 			vncconnection.h vncconnection.c \
 			vncconnectionblt.h \
-			vncconnectionenums.h vncconnectionenums.c \
 			vncmarshal.h vncmarshal.c \
 			vncutil.h vncutil.c
+nodist_libgvnc_1_0_la_SOURCES = \
+			vncconnectionenums.h vncconnectionenums.c \
+			$(NULL)
 
 if HAVE_PULSEAUDIO
 lib_LTLIBRARIES += libgvncpulse-1.0.la
@@ -135,21 +140,27 @@ gtk_vnc_CFLAGS = \
 			-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
 			-DG_LOG_DOMAIN=\"gtk-vnc\"
 
-gtk_vnc_includedir = $(includedir)/gtk-vnc-$(GTK_VNC_API_VERSION)/
-gtk_vnc_include_HEADERS = \
+gtk_vnc_HDRS = \
 			gtk-vnc.h \
 			vncdisplay.h \
-			vncdisplayenums.h \
 			vncgrabsequence.h \
-			vncimageframebuffer.h
+			vncimageframebuffer.h \
+			$(NULL)
+
+nodist_gtk_vnc_HDRS = \
+			vncdisplayenums.h \
+			$(NULL)
 
 gtk_vnc_SOURCES = \
 			vnccairoframebuffer.h vnccairoframebuffer.c \
 			vncdisplay.h vncdisplay.c \
-			vncdisplayenums.h vncdisplayenums.c \
 			vncdisplaykeymap.h vncdisplaykeymap.c \
 			vncgrabsequence.h vncgrabsequence.c \
 			vncmarshal.h vncmarshal.c
+			$(NULL)
+nodist_gtk_vnc_SOURCES = \
+			vncdisplayenums.h vncdisplayenums.c \
+			$(NULL)
 
 if HAVE_GTK_2
 gtk_vnc_SOURCES += \
@@ -164,16 +175,24 @@ gtk_vnc_LDFLAGS = \
 
 if HAVE_GTK_2
 lib_LTLIBRARIES += libgtk-vnc-1.0.la
+libgtk_vnc_1_0_ladir = $(includedir)/gtk-vnc-$(GTK_VNC_API_VERSION)/
 libgtk_vnc_1_0_la_LIBADD = $(gtk_vnc_LIBADD)
 libgtk_vnc_1_0_la_CFLAGS = $(gtk_vnc_CFLAGS)
 libgtk_vnc_1_0_la_LDFLAGS = $(gtk_vnc_LDFLAGS) -version-info 0:1:0
 libgtk_vnc_1_0_la_SOURCES = $(gtk_vnc_SOURCES)
+libgtk_vnc_1_0_la_HEADERS = $(gtk_vnc_HDRS)
+nodist_libgtk_vnc_1_0_la_SOURCES = $(nodist_gtk_vnc_SOURCES)
+nodist_libgtk_vnc_1_0_la_HEADERS = $(nodist_gtk_vnc_HDRS)
 else
 lib_LTLIBRARIES += libgtk-vnc-2.0.la
+libgtk_vnc_2_0_ladir = $(includedir)/gtk-vnc-$(GTK_VNC_API_VERSION)/
 libgtk_vnc_2_0_la_LIBADD = $(gtk_vnc_LIBADD)
 libgtk_vnc_2_0_la_CFLAGS = $(gtk_vnc_CFLAGS)
 libgtk_vnc_2_0_la_LDFLAGS = $(gtk_vnc_LDFLAGS) -version-info 0:2:0
 libgtk_vnc_2_0_la_SOURCES = $(gtk_vnc_SOURCES)
+libgtk_vnc_2_0_la_HEADERS = $(gtk_vnc_HDRS)
+nodist_libgtk_vnc_2_0_la_SOURCES = $(nodist_gtk_vnc_SOURCES)
+nodist_libgtk_vnc_2_0_la_HEADERS = $(nodist_gtk_vnc_HDRS)
 endif
 
 EXTRA_DIST += keymap-gen.pl keymaps.csv