[gtk-vnc] Distribute built keymap files

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

commit 59e879f5f177cedc7aff842355a3a4991b919302
Author: Daniel P. Berrange <dan berrange com>
Date:   Mon Nov 22 21:28:47 2010 +0000

    Distribute built keymap files
    
    Avoid the need for end users to have the Perl Text::CSV module
    installed, by including the pre-generated keymap source files
    in the dist.
    
    * gtk-vnc.spec.in: Remove dep on perl(Text::CSV)
    * src/Makefile.am: Include keymaps in dist

 gtk-vnc.spec.in |    1 -
 src/Makefile.am |   11 +++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index 97efc96..0f72800 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -33,7 +33,6 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: gir-repository-devel
 %endif
 %endif
-BuildRequires: perl(Text::CSV)
 %if %{with_plugin}
 %if 0%{?fedora} > 8
 BuildRequires: xulrunner-devel
diff --git a/src/Makefile.am b/src/Makefile.am
index 87353b2..37f8444 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,6 +145,10 @@ KEYMAPS = \
 $(KEYMAPS): $(KEYMAP_GEN) keymaps.csv
 BUILT_SOURCES += $(KEYMAPS)
 
+# Avoid need for perl(Text::CSV) by end users
+EXTRA_DIST += $(KEYMAPS)
+MAINTAINERCLEANFILES = $(KEYMAPS)
+
 vncdisplaykeymap.c: $(KEYMAPS)
 
 vncdisplaykeymap_xorgevdev2rfb.c:
@@ -229,11 +233,14 @@ vncdisplay.c:: vncmarshal.h vncdisplayenums.h
 
 vncconnection.c:: vncmarshal.h vncconnectionenums.h
 
-BUILT_SOURCES += vncmarshal.c vncmarshal.h \
+MARSHAL_FILES = vncmarshal.c vncmarshal.h
+ENUM_FILES = \
 	vncdisplayenums.h vncdisplayenums.c \
 	vncconnectionenums.h vncconnectionenums.c
 
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES += $(MARSHAL_FILES) $(ENUM_FILES)
+
+CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES)
 
 if WITH_PYTHON
 pyexec_LTLIBRARIES = gtkvnc.la