[gnome-lirc-properties] Clean up repository

[Bastien Nocera <hadess src gnome org>]

commit 4cf98d79c2753eb189bf0daa5fb69a5fe33d4b3a
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 26 17:30:22 2010 +0100

    Clean up repository
    
    Always regenerate the linux input conf file, add a separate
    Makefile for bin/, remove unneeded patches.

 Makefile.am                                        |   10 +--
 bin/Makefile.am                                    |    5 +
 configure.ac                                       |    1 +
 data/Makefile.am                                   |    7 +-
 ...se-new-instead-of-conf-as-filename-suffix.patch |   28 -----
 patches/0002-Add-resume-switch-to-irrecord.patch   |  109 --------------------
 6 files changed, 12 insertions(+), 148 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 65eda34..c2314b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,10 @@
-SUBDIRS = data gnome_lirc_properties help po
-bin_SCRIPTS = bin/gnome-lirc-properties
+SUBDIRS = bin data gnome_lirc_properties help po
 man1_MANS = man/gnome-lirc-properties.1
 
 EXTRA_DIST = \
         autogen.sh \
-	bin/lirc-receiver-list \
-	bin/todo-list \
-	data/overrides.conf \
 	gnome-doc-utils.make \
-	man/gnome-lirc-properties.1 \
-	patches/0001-Use-new-instead-of-conf-as-filename-suffix.patch \
-	patches/0002-Add-resume-switch-to-irrecord.patch
+	man/gnome-lirc-properties.1
 
 DISTCLEANFILES = \
 	intltool-extract \
diff --git a/bin/Makefile.am b/bin/Makefile.am
new file mode 100644
index 0000000..3ce6ac8
--- /dev/null
+++ b/bin/Makefile.am
@@ -0,0 +1,5 @@
+bin_SCRIPTS = gnome-lirc-properties
+
+EXTRA_DIST =					\
+	lirc-receiver-list			\
+	todo-list
diff --git a/configure.ac b/configure.ac
index 02b3793..53ccd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,7 @@ AC_SUBST([devinput_driver])
 dnl generate files ===
 
 AC_CONFIG_FILES([Makefile
+                 bin/Makefile
                  data/Makefile
                  data/gnome-lirc-properties.desktop.in
                  data/org.gnome.lirc-properties.mechanism.policy
diff --git a/data/Makefile.am b/data/Makefile.am
index 947207d..e5c5454 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -32,9 +32,8 @@ lirc_generate_linux_input_LDADD = $(GLIB_LIBS)
 
 resourcesdir = $(pkgdatadir)
 
-check: regenerate-linux-input-layer-conf
-regenerate-linux-input-layer-conf: lirc-generate-linux-input
-	$(AM_V_GEN) $(builddir)/lirc-generate-linux-input > $(builddir)/linux-input-layer-lircd.conf
+linux-input-layer-lircd.conf: lirc-generate-linux-input /usr/include/linux/input.h
+	$(AM_V_GEN) $(builddir)/lirc-generate-linux-input > $@
 
 resources_DATA = \
 	gnome-lirc-properties.ui \
@@ -44,6 +43,7 @@ resources_DATA = \
 	receivers.conf
 
 EXTRA_DIST = \
+	overrides.conf \
 	$(dbusconf_DATA) \
 	$(desktop_in_files) \
 	$(policykitpolicy_in_files) \
@@ -52,6 +52,7 @@ EXTRA_DIST = \
 	$(fdi_DATA)
 
 DISTCLEANFILES = \
+	linux-input-layer-lircd.conf \
 	$(desktop_DATA) \
 	$(policykitpolicy_DATA) \
 	$(service_DATA)